From 13e51bdeb15824730b88dd96afc9ddff7a9cb439 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Tue, 24 Jul 2007 18:03:45 +0800 Subject: [PATCH] --- yaml --- r: 65988 b: refs/heads/master c: 314c98d589b9da40af42cfe7213eff04c74caea3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/bfin_gpio.c | 10 ++++++++-- trunk/arch/blackfin/mach-bf548/gpio.c | 11 +++++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7f80ca4b08bc..4b9f868aeb15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06039e90b90af4029184d577b3c66e59f6039a9e +refs/heads/master: 314c98d589b9da40af42cfe7213eff04c74caea3 diff --git a/trunk/arch/blackfin/kernel/bfin_gpio.c b/trunk/arch/blackfin/kernel/bfin_gpio.c index b818a8da1215..979cf79d3799 100644 --- a/trunk/arch/blackfin/kernel/bfin_gpio.c +++ b/trunk/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/trunk/arch/blackfin/mach-bf548/gpio.c b/trunk/arch/blackfin/mach-bf548/gpio.c index c073ab36066d..f3b9deacd332 100644 --- a/trunk/arch/blackfin/mach-bf548/gpio.c +++ b/trunk/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);