diff options
| author | Hartmut Knaack <knaack.h@gmx.de> | 2014-01-01 23:04:00 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-02 00:58:42 +0100 |
| commit | 96540b62efda4daf7654678e00361fc8ed3a4473 (patch) | |
| tree | 3bc102e9cd16998295bcf8206bf8eb4aa43e681f | |
| parent | b7e031b8d7fdec31c0c50b7f972524d11d5905d4 (diff) | |
staging:iio:ad799x fix error_free_irq which was freeing an irq that may not have been requested
commit 38408d056188be29a6c4e17f3703c796551bb330 upstream.
Only free an IRQ in error_free_irq, if it has been requested previously.
Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/staging/iio/adc/ad799x_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c index ee6cd792bec..f79d0cb8d18 100644 --- a/drivers/staging/iio/adc/ad799x_core.c +++ b/drivers/staging/iio/adc/ad799x_core.c @@ -873,7 +873,8 @@ static int __devinit ad799x_probe(struct i2c_client *client, return 0; error_free_irq: - free_irq(client->irq, indio_dev); + if (client->irq > 0) + free_irq(client->irq, indio_dev); error_cleanup_ring: ad799x_ring_cleanup(indio_dev); error_disable_reg: |