Commit 53aebb53 authored by Andre Bartke's avatar Andre Bartke Committed by Greg Kroah-Hartman

staging: iio: error case memory leak fix

The data pointer should be freed in the error
cases of adis16400_trigger_handler().
Signed-off-by: default avatarAndre Bartke <andre.bartke@gmail.com>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0d422f42
...@@ -137,13 +137,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) ...@@ -137,13 +137,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
if (st->variant->flags & ADIS16400_NO_BURST) { if (st->variant->flags & ADIS16400_NO_BURST) {
ret = adis16350_spi_read_all(&indio_dev->dev, st->rx); ret = adis16350_spi_read_all(&indio_dev->dev, st->rx);
if (ret < 0) if (ret < 0)
return ret; goto err;
for (; i < ring->scan_count; i++) for (; i < ring->scan_count; i++)
data[i] = *(s16 *)(st->rx + i*2); data[i] = *(s16 *)(st->rx + i*2);
} else { } else {
ret = adis16400_spi_read_burst(&indio_dev->dev, st->rx); ret = adis16400_spi_read_burst(&indio_dev->dev, st->rx);
if (ret < 0) if (ret < 0)
return ret; goto err;
for (; i < indio_dev->ring->scan_count; i++) { for (; i < indio_dev->ring->scan_count; i++) {
j = __ffs(mask); j = __ffs(mask);
mask &= ~(1 << j); mask &= ~(1 << j);
...@@ -158,9 +158,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) ...@@ -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); ring->access->store_to(indio_dev->ring, (u8 *) data, pf->timestamp);
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
kfree(data);
kfree(data);
return IRQ_HANDLED; return IRQ_HANDLED;
err:
kfree(data);
return ret;
} }
void adis16400_unconfigure_ring(struct iio_dev *indio_dev) void adis16400_unconfigure_ring(struct iio_dev *indio_dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment