From: Oliver Neukum Date: Thu, 28 Apr 2022 13:34:55 +0000 (+0200) Subject: media: imon: drop references only after device is no longer used X-Git-Tag: v5.19-rc1~179^2~91 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=af2aa3c4e52bc63b532b55b1ac66f262ecff2fb3;p=tomoyo%2Ftomoyo-test1.git media: imon: drop references only after device is no longer used The point of using get/put_device() is to keep references for as long as the device may be in use. That means dropping them must be the penultimate action right before freeing the memory. Signed-off-by: Oliver Neukum Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index 8dbeab48ed3c..ad8bca8a8abd 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c @@ -2523,7 +2523,6 @@ static void imon_disconnect(struct usb_interface *interface) if (ifnum == 0) { ictx->dev_present_intf0 = false; usb_kill_urb(ictx->rx_urb_intf0); - usb_put_dev(ictx->usbdev_intf0); input_unregister_device(ictx->idev); rc_unregister_device(ictx->rdev); if (ictx->display_supported) { @@ -2532,14 +2531,15 @@ static void imon_disconnect(struct usb_interface *interface) else if (ictx->display_type == IMON_DISPLAY_TYPE_VFD) usb_deregister_dev(interface, &imon_vfd_class); } + usb_put_dev(ictx->usbdev_intf0); } else { ictx->dev_present_intf1 = false; usb_kill_urb(ictx->rx_urb_intf1); - usb_put_dev(ictx->usbdev_intf1); if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) { del_timer_sync(&ictx->ttimer); input_unregister_device(ictx->touch); } + usb_put_dev(ictx->usbdev_intf1); } if (!ictx->dev_present_intf0 && !ictx->dev_present_intf1)