Skip to content

Commit 3aa385a

Browse files
Linus Walleijjic23
authored andcommitted
iio: accel: bmc150: Fix irq assumption regression
The code in bmc150-accel-core.c unconditionally calls bmc150_accel_set_interrupt() in the iio_buffer_setup_ops, such as on the runtime PM resume path giving a kernel splat like this if the device has no interrupts: Unable to handle kernel NULL pointer dereference at virtual address 00000001 when read PC is at bmc150_accel_set_interrupt+0x98/0x194 LR is at __pm_runtime_resume+0x5c/0x64 (...) Call trace: bmc150_accel_set_interrupt from bmc150_accel_buffer_postenable+0x40/0x108 bmc150_accel_buffer_postenable from __iio_update_buffers+0xbe0/0xcbc __iio_update_buffers from enable_store+0x84/0xc8 enable_store from kernfs_fop_write_iter+0x154/0x1b4 This bug seems to have been in the driver since the beginning, but it only manifests recently, I do not know why. Store the IRQ number in the state struct, as this is a common pattern in other drivers, then use this to determine if we have IRQ support or not. Cc: stable@vger.kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Reviewed-by: Nuno Sá <nuno.sa@analog.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent 8abbf45 commit 3aa385a

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/iio/accel/bmc150-accel-core.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,10 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
523523
const struct bmc150_accel_interrupt_info *info = intr->info;
524524
int ret;
525525

526+
/* We do not always have an IRQ */
527+
if (data->irq <= 0)
528+
return 0;
529+
526530
if (state) {
527531
if (atomic_inc_return(&intr->users) > 1)
528532
return 0;
@@ -1696,6 +1700,7 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
16961700
}
16971701

16981702
if (irq > 0) {
1703+
data->irq = irq;
16991704
ret = devm_request_threaded_irq(dev, irq,
17001705
bmc150_accel_irq_handler,
17011706
bmc150_accel_irq_thread_handler,

drivers/iio/accel/bmc150-accel.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ enum bmc150_accel_trigger_id {
5858

5959
struct bmc150_accel_data {
6060
struct regmap *regmap;
61+
int irq;
6162
struct regulator_bulk_data regulators[2];
6263
struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];
6364
struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];

0 commit comments

Comments
 (0)