Skip to content

Commit 0a6726e

Browse files
sanjay-embeddedjic23
authored andcommitted
iio: accel: mma8452: switch to non-devm request_threaded_irq()
Avoid using devm_request_threaded_irq() as the driver requires explicit error-handling path(s). Using devm_* API together with goto-based unwinding breaks the expected LIFO resource release model. Add explicit IRQ cleanup in the driver teardown paths to follow kernel resource management conventions. Signed-off-by: Sanjay Chitroda <sanjayembeddedse@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
1 parent 5bdff29 commit 0a6726e

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

drivers/iio/accel/mma8452.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,18 +1682,16 @@ static int mma8452_probe(struct i2c_client *client)
16821682
goto trigger_cleanup;
16831683

16841684
if (client->irq) {
1685-
ret = devm_request_threaded_irq(&client->dev,
1686-
client->irq,
1687-
NULL, mma8452_interrupt,
1688-
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
1689-
client->name, indio_dev);
1685+
ret = request_threaded_irq(client->irq, NULL, mma8452_interrupt,
1686+
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
1687+
client->name, indio_dev);
16901688
if (ret)
16911689
goto buffer_cleanup;
16921690
}
16931691

16941692
ret = pm_runtime_set_active(&client->dev);
16951693
if (ret < 0)
1696-
goto buffer_cleanup;
1694+
goto free_irq;
16971695

16981696
pm_runtime_enable(&client->dev);
16991697
pm_runtime_set_autosuspend_delay(&client->dev,
@@ -1702,7 +1700,7 @@ static int mma8452_probe(struct i2c_client *client)
17021700

17031701
ret = iio_device_register(indio_dev);
17041702
if (ret < 0)
1705-
goto buffer_cleanup;
1703+
goto free_irq;
17061704

17071705
ret = mma8452_set_freefall_mode(data, false);
17081706
if (ret < 0)
@@ -1713,6 +1711,10 @@ static int mma8452_probe(struct i2c_client *client)
17131711
unregister_device:
17141712
iio_device_unregister(indio_dev);
17151713

1714+
free_irq:
1715+
if (client->irq)
1716+
free_irq(client->irq, indio_dev);
1717+
17161718
buffer_cleanup:
17171719
iio_triggered_buffer_cleanup(indio_dev);
17181720

@@ -1738,6 +1740,9 @@ static void mma8452_remove(struct i2c_client *client)
17381740
pm_runtime_disable(&client->dev);
17391741
pm_runtime_set_suspended(&client->dev);
17401742

1743+
if (client->irq)
1744+
free_irq(client->irq, indio_dev);
1745+
17411746
iio_triggered_buffer_cleanup(indio_dev);
17421747
mma8452_trigger_cleanup(indio_dev);
17431748
mma8452_standby(iio_priv(indio_dev));

0 commit comments

Comments
 (0)