hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging:iio:adis16400: Do not return error code in the interrupt handler 

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>
This commit is contained in:
Lars-Peter Clausen 2012-07-04 17:09:00 +01:00 committed by Jonathan Cameron
parent b82ed7d680
commit 462c8d2794
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/iio/imu/adis16400_ring.c
View File

@ -125,20 +125,20 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL); data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (data == NULL) { if (data == NULL) {
dev_err(&st->us->dev, "memory alloc failed in ring bh"); dev_err(&st->us->dev, "memory alloc failed in ring bh");
return -ENOMEM; goto done;
} }
if (scan_count) { if (scan_count) {
if (st->variant->flags & ADIS16400_NO_BURST) { if (st->variant->flags & ADIS16400_NO_BURST) {
ret = adis16350_spi_read_all(indio_dev, st->rx); ret = adis16350_spi_read_all(indio_dev, st->rx);
if (ret < 0) if (ret < 0)
goto err; goto done;
for (; i < scan_count; i++) for (; i < 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, st->rx); ret = adis16400_spi_read_burst(indio_dev, st->rx);
if (ret < 0) if (ret < 0)
goto err; goto done;
for (; i < scan_count; i++) { for (; i < scan_count; i++) {
j = __ffs(mask); j = __ffs(mask);
mask &= ~(1 << j); 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; *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp); ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp);
done:
kfree(data);
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
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)