summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2022-04-28 15:34:54 +0200
committerMauro Carvalho Chehab <mchehab@kernel.org>2022-05-13 11:02:22 +0200
commit07af64dddfb87d1af9360204155396be07b7aa70 (patch)
tree913b0ce274e86800ff7fb4fd3367a9486f298a65 /drivers/media/rc
parenta43617a5bf1b6782303d11bec01cf67a2dfc82e8 (diff)
downloadlinux-07af64dddfb87d1af9360204155396be07b7aa70.tar.bz2
media: imon: fix timer racing disconnect
The timer will report events for an input device. Reporting events for an unregistered device is bad. Hence the timer must be killed first. Signed-off-by: Oliver Neukum <oneukum@suse.com> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/imon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 761b7fa57378..8dbeab48ed3c 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2537,8 +2537,8 @@ static void imon_disconnect(struct usb_interface *interface)
usb_kill_urb(ictx->rx_urb_intf1);
usb_put_dev(ictx->usbdev_intf1);
if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) {
- input_unregister_device(ictx->touch);
del_timer_sync(&ictx->ttimer);
+ input_unregister_device(ictx->touch);
}
}