aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2013-06-02 20:00:00 +0100
committerJonathan Cameron <jic23@kernel.org>2013-06-04 18:30:56 +0100
commitb840333e955eff9a8db33af1e1ff409ca4e55502 (patch)
tree5faf6355e5b2a3e7b3f7c5d7a753c1a5c91ff89c /drivers/staging/iio
parentiio: at91_adc: Add missing CONFIG_OF macro (diff)
downloadlinux-dev-b840333e955eff9a8db33af1e1ff409ca4e55502.tar.xz
linux-dev-b840333e955eff9a8db33af1e1ff409ca4e55502.zip
staging:iio:trigger:gpio bug in release of gpio in error path
Also dropped the unneeded gpio.h header. Signed-off-by: Jonathan Cameron <jic23@kernel.org> Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r--drivers/staging/iio/trigger/iio-trig-gpio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/iio/trigger/iio-trig-gpio.c b/drivers/staging/iio/trigger/iio-trig-gpio.c
index 7c593d18a910..69dabca0f4e8 100644
--- a/drivers/staging/iio/trigger/iio-trig-gpio.c
+++ b/drivers/staging/iio/trigger/iio-trig-gpio.c
@@ -19,7 +19,6 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
-#include <linux/gpio.h>
#include <linux/slab.h>
#include <linux/iio/iio.h>
@@ -122,7 +121,7 @@ error_free_completed_registrations:
&iio_gpio_trigger_list,
alloc_list) {
trig_info = iio_trigger_get_drvdata(trig);
- free_irq(gpio_to_irq(trig_info->irq), trig);
+ free_irq(trig_info->irq, trig);
kfree(trig_info);
iio_trigger_unregister(trig);
}