1 files changed, 15 insertions, 0 deletions

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 78438d88d22a..b58b0de3c907 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -930,6 +930,8 @@ void peripheral_free(unsigned short per)
 
         reserved_peri_map[gpio_bank(ident)] &= ~gpio_bit(ident);
 
+        set_label(ident, "free");
+
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(peripheral_free);
@@ -969,6 +971,17 @@ int gpio_request(unsigned short gpio, const char *label)
 
         local_irq_save(flags);
 
+        /*
+         * Allow that the identical GPIO can
+         * be requested from the same driver twice
+         * Do nothing and return -
+         */
+
+        if (cmp_label(gpio, label) == 0) {
+                local_irq_restore(flags);
+                return 0;
+        }
+
         if (unlikely(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
                 printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved by %s !\n",
                          gpio, get_label(gpio));
@@ -1016,6 +1029,8 @@ void gpio_free(unsigned short gpio)
 
         reserved_gpio_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
 
+        set_label(gpio, "free");
+
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(gpio_free);