Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

[cascardo/linux.git] / drivers / gpio / gpio-etraxfs.c

diff --git a/drivers/gpio/gpio-etraxfs.c b/drivers/gpio/gpio-etraxfs.c
index ca33bda..2ffcd9f 100644 (file)
--- a/drivers/gpio/gpio-etraxfs.c
+++ b/drivers/gpio/gpio-etraxfs.c
@@ -292,6 +292,7 @@ static int etraxfs_gpio_irq_request_resources(struct irq_data *d)
        struct etraxfs_gpio_chip *chip = irq_data_get_irq_chip_data(d);
        struct etraxfs_gpio_block *block = chip->block;
        unsigned int grpirq = etraxfs_gpio_to_group_irq(d->hwirq);
+       int ret = -EBUSY;
 
        spin_lock(&block->lock);
        if (block->group[grpirq])
@@ -313,7 +314,7 @@ static int etraxfs_gpio_irq_request_resources(struct irq_data *d)
 
 out:
        spin_unlock(&block->lock);
-       return -EBUSY;
+       return ret;
 }
 
 static void etraxfs_gpio_irq_release_resources(struct irq_data *d)