Re: [PATCH] HID: magicmouse: Fix an error handling path in magicmouse_probe()

From
José Expósito <hidden>
Date
2021-12-29 07:50:33
Also in
kernel-janitors, lkml
Reply to
Christophe JAILLET, 2021-12-28
On Tue, Dec 28, 2021 at 10:09:17PM +0100, Christophe JAILLET wrote:
quoted hunk ↗ jump to hunk
If the timer introduced by the commit below is started, then it must be
deleted in the error handling of the probe. Otherwise it would trigger
once the driver is no more.

Fixes: 0b91b4e4dae6 ("HID: magicmouse: Report battery level over USB")
Signed-off-by: Christophe JAILLET <redacted>
---
 drivers/hid/hid-magicmouse.c | 1 +
 1 file changed, 1 insertion(+)
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index eba1e8087bfd..b8b08f0a8c54 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -873,6 +873,7 @@ static int magicmouse_probe(struct hid_device *hdev,
 
 	return 0;
 err_stop_hw:
+	del_timer_sync(&msc->battery_timer);
 	hid_hw_stop(hdev);
 	return ret;
 }
-- 
2.32.0
My bad, thanks for catching it!

Tested-by: José Expósito <redacted>
Thread (4 messages) 4 messages, 3 authors, last reply 2022-01-06
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help