From d9eaa1377b3ca7dc59fbb3be9ae16d0143c7f2f2 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 4 Jul 2012 17:09:00 +0100 Subject: [PATCH] --- yaml --- r: 317823 b: refs/heads/master c: 462c8d27940d1d41f76091544245b0af11b64c81 h: refs/heads/master i: 317821: 31712df39e2a665946476e5c4e1d75bf8d56986f 317819: a888e0e9a5ce53c16a4a3bf668b7bb0034dae456 317815: 075b746a4c88b9ff44917f5edef12f030d967e4e 317807: 91ddbe48ef8d4be3da6a93601816c79c6aeb0d32 317791: ede305d6e9b6f7873cbf24ebf7dbb166b02bd321 317759: 421f7266ab0676f3d260149e09bb27a3524f5790 317695: 6bd2b170740df4dedf9eb2c551d47968da4f00eb v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/imu/adis16400_ring.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 18af7234fca9..2ff7e7d27d50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b82ed7d6805ef2a31503999edc80787083d4426f +refs/heads/master: 462c8d27940d1d41f76091544245b0af11b64c81 diff --git a/trunk/drivers/staging/iio/imu/adis16400_ring.c b/trunk/drivers/staging/iio/imu/adis16400_ring.c index 809e2c4270d1..beec650ddbdb 100644 --- a/trunk/drivers/staging/iio/imu/adis16400_ring.c +++ b/trunk/drivers/staging/iio/imu/adis16400_ring.c @@ -125,20 +125,20 @@ static irqreturn_t adis16400_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 (scan_count) { if (st->variant->flags & ADIS16400_NO_BURST) { ret = adis16350_spi_read_all(indio_dev, st->rx); if (ret < 0) - goto err; + goto done; for (; i < scan_count; i++) data[i] = *(s16 *)(st->rx + i*2); } else { ret = adis16400_spi_read_burst(indio_dev, st->rx); if (ret < 0) - goto err; + goto done; for (; i < scan_count; i++) { j = __ffs(mask); mask &= ~(1 << j); @@ -152,14 +152,11 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp); +done: + kfree(data); iio_trigger_notify_done(indio_dev->trig); - kfree(data); return IRQ_HANDLED; - -err: - kfree(data); - return ret; } void adis16400_unconfigure_ring(struct iio_dev *indio_dev)