]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging:iio:adis16260: Do not return error code in the interrupt handler
authorLars-Peter Clausen <lars@metafoo.de>
Wed, 4 Jul 2012 16:09:00 +0000 (17:09 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sun, 8 Jul 2012 19:02:30 +0000 (20:02 +0100)
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/staging/iio/gyro/adis16260_ring.c

index 0fe2d9dfb6cd198b8b804aadb735fccbb20aea89..eeee8e760e6cc68fd7b672398deb2a4702f35282 100644 (file)
@@ -69,7 +69,7 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
        data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
        if (data == NULL) {
                dev_err(&st->us->dev, "memory alloc failed in ring bh");
-               return -ENOMEM;
+               goto done;
        }
 
        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
@@ -84,8 +84,9 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
 
        ring->access->store_to(ring, (u8 *)data, pf->timestamp);
 
-       iio_trigger_notify_done(indio_dev->trig);
        kfree(data);
+done:
+       iio_trigger_notify_done(indio_dev->trig);
 
        return IRQ_HANDLED;
 }