aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-08-31 08:56:04 +0200
committerLinus Walleij <linus.walleij@linaro.org>2015-08-31 08:56:04 +0200
commit01e2dae991771adb1257eb5cd3cecfda1aa09ba9 (patch)
treec45f628dc3e9d3f0576b7b9d65eda31f1ee68b43
parent0c9fc10df211e0c931787a51c58caf487035f74e (diff)
Revert "gpio: extraxfs: fix returnvar.cocci warnings"gpio-v4.3-1
This reverts commit 5e22ec019823b0204720e1ad9a5866c638332b3a.
-rw-r--r--drivers/gpio/gpio-etraxfs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-etraxfs.c b/drivers/gpio/gpio-etraxfs.c
index ca33bda8ec55..2ffcd9fdd1f2 100644
--- 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)

Privacy Policy