1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 89675f862308..f319c9ffd4a8 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -514,6 +514,14 @@ static int gpio_irq_type(struct irq_data *d, unsigned type)
                 return -EINVAL;
         }
 
+        retval = gpio_lock_as_irq(&bank->chip, offset);
+        if (retval) {
+                dev_err(bank->dev, "unable to lock offset %d for IRQ\n",
+                        offset);
+                spin_unlock_irqrestore(&bank->lock, flags);
+                return retval;
+        }
+
         bank->irq_usage |= 1 << GPIO_INDEX(bank, gpio);
         spin_unlock_irqrestore(&bank->lock, flags);
 
@@ -797,6 +805,7 @@ static void gpio_irq_shutdown(struct irq_data *d)
         unsigned offset = GPIO_INDEX(bank, gpio);
 
         spin_lock_irqsave(&bank->lock, flags);
+        gpio_unlock_as_irq(&bank->chip, offset);
         bank->irq_usage &= ~(1 << offset);
         _disable_gpio_module(bank, offset);
         _reset_gpio(bank, gpio);
@@ -957,22 +966,13 @@ static int gpio_output(struct gpio_chip *chip, unsigned offset, int value)
 {
         struct gpio_bank *bank;
         unsigned long flags;
-        int retval = 0;
 
         bank = container_of(chip, struct gpio_bank, chip);
         spin_lock_irqsave(&bank->lock, flags);
-
-        if (LINE_USED(bank->irq_usage, offset)) {
-                        retval = -EINVAL;
-                        goto exit;
-        }
-
         bank->set_dataout(bank, offset, value);
         _set_gpio_direction(bank, offset, 0);
-
-exit:
         spin_unlock_irqrestore(&bank->lock, flags);
-        return retval;
+        return 0;
 }
 
 static int gpio_debounce(struct gpio_chip *chip, unsigned offset,