diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2012-06-04 05:36:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-05 00:47:32 -0400 |
commit | 4f0a788dc892d62fabcfd61b289b6212bdedadfd (patch) | |
tree | 1d398654e33aafb645a9af7e9b515df8d28dbf54 /drivers/staging/iio | |
parent | 4468cb552536731fd85f22a367602e9242a55376 (diff) |
staging:iio:dac:ad5504: Check if IRQ was requested before freeing it
IRQ support is optional, so we have to check whether it was actually requested
before we attempt to free it.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r-- | drivers/staging/iio/dac/ad5504.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/iio/dac/ad5504.c b/drivers/staging/iio/dac/ad5504.c index 220150d2a16..f3d7b47cfe1 100644 --- a/drivers/staging/iio/dac/ad5504.c +++ b/drivers/staging/iio/dac/ad5504.c | |||
@@ -294,7 +294,8 @@ static int __devinit ad5504_probe(struct spi_device *spi) | |||
294 | return 0; | 294 | return 0; |
295 | 295 | ||
296 | error_free_irq: | 296 | error_free_irq: |
297 | free_irq(spi->irq, indio_dev); | 297 | if (spi->irq) |
298 | free_irq(spi->irq, indio_dev); | ||
298 | error_disable_reg: | 299 | error_disable_reg: |
299 | if (!IS_ERR(reg)) | 300 | if (!IS_ERR(reg)) |
300 | regulator_disable(reg); | 301 | regulator_disable(reg); |