mirror of
https://github.com/torvalds/linux.git
synced 2026-06-08 14:42:37 +02:00
HID: magicmouse: Fix an error handling path in magicmouse_probe()
commit33812fc7c8upstream. 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:0b91b4e4da("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
00e3d58f50
commit
2884aac078
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user