2 files changed, 17 insertions, 4 deletions

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index b818a8da1215..979cf79d3799 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 c073ab36066d..f3b9deacd332 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);