* [PATCH v2] iio: adc: qcom-spmi-iadc: balance enable_irq_wake() on driver unbind
@ 2026-05-23 13:46 Stepan Ionichev
2026-05-26 15:06 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Stepan Ionichev @ 2026-05-23 13:46 UTC (permalink / raw)
To: jic23
Cc: dlechner, nuno.sa, andy, hcazarim, linux-iio, linux-arm-msm,
linux-kernel, sozdayvek
iadc_probe() calls enable_irq_wake() after a successful
devm_request_irq(), but the driver has no remove callback or
matching disable_irq_wake(), so the wake reference count on the
IRQ is leaked on module unload or driver unbind.
Check the IRQ request error first, then register a devm action
that calls disable_irq_wake() so the wake reference is released
in the same scope as the enable. While here, drop the inverted
"if (!ret) ... else return ret" in favour of the standard
"if (ret) return ret;" pattern.
Signed-off-by: Stepan Ionichev <sozdayvek@gmail.com>
---
v2:
- Use (long) instead of (unsigned long) for the int<->void* casts (Jonathan)
v1: https://lore.kernel.org/all/20260520190924.12774-1-sozdayvek@gmail.com/
drivers/iio/adc/qcom-spmi-iadc.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/adc/qcom-spmi-iadc.c b/drivers/iio/adc/qcom-spmi-iadc.c
index b64a8a407..88f6be210 100644
--- a/drivers/iio/adc/qcom-spmi-iadc.c
+++ b/drivers/iio/adc/qcom-spmi-iadc.c
@@ -481,6 +481,11 @@ static const struct iio_chan_spec iadc_channels[] = {
},
};
+static void iadc_disable_irq_wake(void *data)
+{
+ disable_irq_wake((long)data);
+}
+
static int iadc_probe(struct platform_device *pdev)
{
struct device_node *node = pdev->dev.of_node;
@@ -538,9 +543,16 @@ static int iadc_probe(struct platform_device *pdev)
if (!iadc->poll_eoc) {
ret = devm_request_irq(dev, irq_eoc, iadc_isr, 0,
"spmi-iadc", iadc);
- if (!ret)
- enable_irq_wake(irq_eoc);
- else
+ if (ret)
+ return ret;
+
+ ret = enable_irq_wake(irq_eoc);
+ if (ret)
+ return ret;
+
+ ret = devm_add_action_or_reset(dev, iadc_disable_irq_wake,
+ (void *)(long)irq_eoc);
+ if (ret)
return ret;
} else {
ret = devm_device_init_wakeup(iadc->dev);
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2] iio: adc: qcom-spmi-iadc: balance enable_irq_wake() on driver unbind
2026-05-23 13:46 [PATCH v2] iio: adc: qcom-spmi-iadc: balance enable_irq_wake() on driver unbind Stepan Ionichev
@ 2026-05-26 15:06 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2026-05-26 15:06 UTC (permalink / raw)
To: Stepan Ionichev
Cc: dlechner, nuno.sa, andy, hcazarim, linux-iio, linux-arm-msm,
linux-kernel
On Sat, 23 May 2026 18:46:13 +0500
Stepan Ionichev <sozdayvek@gmail.com> wrote:
> iadc_probe() calls enable_irq_wake() after a successful
> devm_request_irq(), but the driver has no remove callback or
> matching disable_irq_wake(), so the wake reference count on the
> IRQ is leaked on module unload or driver unbind.
>
> Check the IRQ request error first, then register a devm action
> that calls disable_irq_wake() so the wake reference is released
> in the same scope as the enable. While here, drop the inverted
> "if (!ret) ... else return ret" in favour of the standard
> "if (ret) return ret;" pattern.
>
> Signed-off-by: Stepan Ionichev <sozdayvek@gmail.com>
> ---
> v2:
> - Use (long) instead of (unsigned long) for the int<->void* casts (Jonathan)
Ah. I think this was me being wrong on necessity of original casts..
patch v1 was fine in this respect.. Sorry for waste of time!
One other thing though - seems like a fix so why no Fixes tag?
Jonathan
>
> v1: https://lore.kernel.org/all/20260520190924.12774-1-sozdayvek@gmail.com/
>
> drivers/iio/adc/qcom-spmi-iadc.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/adc/qcom-spmi-iadc.c b/drivers/iio/adc/qcom-spmi-iadc.c
> index b64a8a407..88f6be210 100644
> --- a/drivers/iio/adc/qcom-spmi-iadc.c
> +++ b/drivers/iio/adc/qcom-spmi-iadc.c
> @@ -481,6 +481,11 @@ static const struct iio_chan_spec iadc_channels[] = {
> },
> };
>
> +static void iadc_disable_irq_wake(void *data)
> +{
> + disable_irq_wake((long)data);
> +}
> +
> static int iadc_probe(struct platform_device *pdev)
> {
> struct device_node *node = pdev->dev.of_node;
> @@ -538,9 +543,16 @@ static int iadc_probe(struct platform_device *pdev)
> if (!iadc->poll_eoc) {
> ret = devm_request_irq(dev, irq_eoc, iadc_isr, 0,
> "spmi-iadc", iadc);
> - if (!ret)
> - enable_irq_wake(irq_eoc);
> - else
> + if (ret)
> + return ret;
> +
> + ret = enable_irq_wake(irq_eoc);
> + if (ret)
> + return ret;
> +
> + ret = devm_add_action_or_reset(dev, iadc_disable_irq_wake,
> + (void *)(long)irq_eoc);
> + if (ret)
> return ret;
> } else {
> ret = devm_device_init_wakeup(iadc->dev);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-26 15:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-23 13:46 [PATCH v2] iio: adc: qcom-spmi-iadc: balance enable_irq_wake() on driver unbind Stepan Ionichev
2026-05-26 15:06 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox