lkml.org 
[lkml]   [2007]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/12] Blackfin arch: add missing gpio error handling to make sure we roll back requests in case one fails
    Date
    From: Michael Hennerich <michael.hennerich@analog.com>

    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <bryan.wu@analog.com>
    ---
    arch/blackfin/kernel/bfin_gpio.c | 10 ++++++++--
    arch/blackfin/mach-bf548/gpio.c | 11 +++++++++--
    2 files changed, 17 insertions(+), 4 deletions(-)

    diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
    index 5d488ef..f712772 100644
    --- a/arch/blackfin/kernel/bfin_gpio.c
    +++ b/arch/blackfin/kernel/bfin_gpio.c
    @@ -711,9 +711,15 @@ int peripheral_request_list(unsigned short per[], const char *label)
    int ret;

    for (cnt = 0; per[cnt] != 0; cnt++) {
    +
    ret = peripheral_request(per[cnt], label);
    - if (ret < 0)
    - return ret;
    +
    + if (ret < 0) {
    + for ( ; cnt > 0; cnt--) {
    + peripheral_free(per[cnt - 1]);
    + }
    + return ret;
    + }
    }

    return 0;
    diff --git a/arch/blackfin/mach-bf548/gpio.c b/arch/blackfin/mach-bf548/gpio.c
    index c073ab3..f3b9dea 100644
    --- a/arch/blackfin/mach-bf548/gpio.c
    +++ b/arch/blackfin/mach-bf548/gpio.c
    @@ -212,11 +212,18 @@ int peripheral_request_list(unsigned short per[], const char *label)
    int ret;

    for (cnt = 0; per[cnt] != 0; cnt++) {
    +
    ret = peripheral_request(per[cnt], label);
    - if (ret < 0)
    - return ret;
    +
    + if (ret < 0) {
    + for ( ; cnt > 0; cnt--) {
    + peripheral_free(per[cnt - 1]);
    + }
    + return ret;
    + }
    }

    +
    return 0;
    }
    EXPORT_SYMBOL(peripheral_request_list);
    --
    1.5.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-08-08 05:39    [W:0.021 / U:92.816 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site