From: Greg Kroah-Hartman Date: Tue, 11 Nov 2025 00:42:29 +0000 (+0900) Subject: 5.10-stable patches X-Git-Tag: v6.12.58~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a0ef3a7bebc53b2d9042c52b64943621d2e7b57;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch --- diff --git a/queue-5.10/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch b/queue-5.10/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch new file mode 100644 index 0000000000..d5e0ea2cfb --- /dev/null +++ b/queue-5.10/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch @@ -0,0 +1,36 @@ +From 92bac7d4de9c07933f6b76d8f1c7f8240f911f4f Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Fri, 9 May 2025 09:17:04 +0200 +Subject: extcon: adc-jack: Cleanup wakeup source only if it was enabled + +From: Krzysztof Kozlowski + +commit 92bac7d4de9c07933f6b76d8f1c7f8240f911f4f upstream. + +Driver in the probe enables wakeup source conditionally, so the cleanup +path should do the same - do not release the wakeup source memory if it +was not allocated. + +Link: https://lore.kernel.org/lkml/20250509071703.39442-2-krzysztof.kozlowski@linaro.org/ +Reported-by: Christophe JAILLET +Closes: https://lore.kernel.org/r/22aaebb7-553b-4571-8a43-58a523241082@wanadoo.fr/ +Fixes: 78b6a991eb6c ("extcon: adc-jack: Fix wakeup source leaks on device unbind") +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Chanwoo Choi +Signed-off-by: Greg Kroah-Hartman +--- + drivers/extcon/extcon-adc-jack.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/extcon/extcon-adc-jack.c ++++ b/drivers/extcon/extcon-adc-jack.c +@@ -162,7 +162,8 @@ static int adc_jack_remove(struct platfo + { + struct adc_jack_data *data = platform_get_drvdata(pdev); + +- device_init_wakeup(&pdev->dev, false); ++ if (data->wakeup_source) ++ device_init_wakeup(&pdev->dev, false); + free_irq(data->irq, data); + cancel_work_sync(&data->handler.work); + diff --git a/queue-5.10/series b/queue-5.10/series index 260ceee6c1..ad50f0fe9a 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -169,3 +169,4 @@ sctp-hold-sock-lock-while-iterating-over-address-lis.patch net-usb-qmi_wwan-initialize-mac-header-offset-in-qmi.patch tracing-fix-memory-leaks-in-create_field_var.patch lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch +extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch