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 761b7fa573782aa3c5ced860ee51b47f73ccca21..8dbeab48ed3c933a3efa6038749c193e2e98fb3b 100644 (file)
--- 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);
                }
        }