summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-magicmouse.c
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2021-12-29 00:09:17 +0300
committerJiri Kosina <jkosina@suse.cz>2022-01-06 17:39:55 +0300
commit33812fc7c8d77a43b7e2bf36a0d5a57c277a4b0c (patch)
tree084e756a08bfb9705496c7926d0a43d8fe3a2550 /drivers/hid/hid-magicmouse.c
parent0b91b4e4dae63cd43871fc2012370b86ee588f91 (diff)
downloadlinux-33812fc7c8d77a43b7e2bf36a0d5a57c277a4b0c.tar.xz
HID: magicmouse: Fix an error handling path in magicmouse_probe()
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 <christophe.jaillet@wanadoo.fr> Tested-by: José Expósito <jose.exposito89@gmail.com> Reported-by: <syzbot+a437546ec71b04dfb5ac@syzkaller.appspotmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-magicmouse.c')
-rw-r--r--drivers/hid/hid-magicmouse.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 167b6a5dd226..39d7956066cf 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -870,6 +870,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;
}