git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 38408d056188be29a6c4e17f3703c796551bb330 Mon Sep 17 00:00:00 2001
   2 From: Hartmut Knaack <knaack.h@gmx.de>
   3 Date: Wed, 1 Jan 2014 23:04:00 +0000
   4 Subject: staging:iio:ad799x fix error_free_irq which was freeing an irq that may not have been requested
   5
   6 From: Hartmut Knaack <knaack.h@gmx.de>
   7
   8 commit 38408d056188be29a6c4e17f3703c796551bb330 upstream.
   9
  10 Only free an IRQ in error_free_irq, if it has been requested previously.
  11
  12 Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
  13 Acked-by: Lars-Peter Clausen <lars@metafoo.de>
  14 Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16
  17 ---
  18  drivers/staging/iio/adc/ad799x_core.c |    3 ++-
  19  1 file changed, 2 insertions(+), 1 deletion(-)
  20
  21 --- a/drivers/staging/iio/adc/ad799x_core.c
  22 +++ b/drivers/staging/iio/adc/ad799x_core.c
  23 @@ -873,7 +873,8 @@ static int __devinit ad799x_probe(struct
  24         return 0;
  25
  26  error_free_irq:
  27 -       free_irq(client->irq, indio_dev);
  28 +       if (client->irq > 0)
  29 +               free_irq(client->irq, indio_dev);
  30  error_cleanup_ring:
  31         ad799x_ring_cleanup(indio_dev);
  32  error_disable_reg: