diff options
| author | Andre Bartke <andre.bartke@googlemail.com> | 2011-06-02 00:21:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 12:28:43 -0700 |
| commit | 53aebb5312c797e4b63fb50473a55ed054b3cb2f (patch) | |
| tree | f108a02c9b34e8abe10301fc1dd00ef9bcf069cd /drivers/staging | |
| parent | 0d422f4237ce515678ebbb8781881e5d2e58b9d4 (diff) | |
| download | kernel_goldelico_gta04-53aebb5312c797e4b63fb50473a55ed054b3cb2f.zip kernel_goldelico_gta04-53aebb5312c797e4b63fb50473a55ed054b3cb2f.tar.gz kernel_goldelico_gta04-53aebb5312c797e4b63fb50473a55ed054b3cb2f.tar.bz2 | |
staging: iio: error case memory leak fix
The data pointer should be freed in the error
cases of adis16400_trigger_handler().
Signed-off-by: Andre Bartke <andre.bartke@gmail.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/imu/adis16400_ring.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c index 2589a7e..3612373 100644 --- a/drivers/staging/iio/imu/adis16400_ring.c +++ b/drivers/staging/iio/imu/adis16400_ring.c @@ -137,13 +137,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) if (st->variant->flags & ADIS16400_NO_BURST) { ret = adis16350_spi_read_all(&indio_dev->dev, st->rx); if (ret < 0) - return ret; + goto err; for (; i < ring->scan_count; i++) data[i] = *(s16 *)(st->rx + i*2); } else { ret = adis16400_spi_read_burst(&indio_dev->dev, st->rx); if (ret < 0) - return ret; + goto err; for (; i < indio_dev->ring->scan_count; i++) { j = __ffs(mask); mask &= ~(1 << j); @@ -158,9 +158,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) ring->access->store_to(indio_dev->ring, (u8 *) data, pf->timestamp); iio_trigger_notify_done(indio_dev->trig); - kfree(data); + kfree(data); return IRQ_HANDLED; + +err: + kfree(data); + return ret; } void adis16400_unconfigure_ring(struct iio_dev *indio_dev) |