From: Oliver Neukum <oneukum@suse.com>
Date: Thu, 28 Apr 2022 13:34:54 +0000 (+0200)
Subject: media: imon: fix timer racing disconnect
X-Git-Tag: microblaze-v5.20~181^2~92
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=07af64dddfb87d1af9360204155396be07b7aa70;p=linux-2.6-microblaze.git

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>
---

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);
 		}
 	}