Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[~andy/linux] / drivers / staging / iio / accel / adis16209_ring.c

diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index 090607504c937ebeba25731a3eb2af8212f84805..1a4a55c27c7c7795fbe9370afee5a5fdf98036c3 100644 (file)
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -66,7 +66,7 @@ static irqreturn_t adis16209_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) &&
@@ -81,8 +81,9 @@ static irqreturn_t adis16209_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;
 }