Commit af2aa3c4 authored by Oliver Neukum's avatar Oliver Neukum Committed by Mauro Carvalho Chehab

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: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 07af64dd
...@@ -2523,7 +2523,6 @@ static void imon_disconnect(struct usb_interface *interface) ...@@ -2523,7 +2523,6 @@ static void imon_disconnect(struct usb_interface *interface)
if (ifnum == 0) { if (ifnum == 0) {
ictx->dev_present_intf0 = false; ictx->dev_present_intf0 = false;
usb_kill_urb(ictx->rx_urb_intf0); usb_kill_urb(ictx->rx_urb_intf0);
usb_put_dev(ictx->usbdev_intf0);
input_unregister_device(ictx->idev); input_unregister_device(ictx->idev);
rc_unregister_device(ictx->rdev); rc_unregister_device(ictx->rdev);
if (ictx->display_supported) { if (ictx->display_supported) {
...@@ -2532,14 +2531,15 @@ static void imon_disconnect(struct usb_interface *interface) ...@@ -2532,14 +2531,15 @@ static void imon_disconnect(struct usb_interface *interface)
else if (ictx->display_type == IMON_DISPLAY_TYPE_VFD) else if (ictx->display_type == IMON_DISPLAY_TYPE_VFD)
usb_deregister_dev(interface, &imon_vfd_class); usb_deregister_dev(interface, &imon_vfd_class);
} }
usb_put_dev(ictx->usbdev_intf0);
} else { } else {
ictx->dev_present_intf1 = false; ictx->dev_present_intf1 = false;
usb_kill_urb(ictx->rx_urb_intf1); usb_kill_urb(ictx->rx_urb_intf1);
usb_put_dev(ictx->usbdev_intf1);
if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) { if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) {
del_timer_sync(&ictx->ttimer); del_timer_sync(&ictx->ttimer);
input_unregister_device(ictx->touch); input_unregister_device(ictx->touch);
} }
usb_put_dev(ictx->usbdev_intf1);
} }
if (!ictx->dev_present_intf0 && !ictx->dev_present_intf1) if (!ictx->dev_present_intf0 && !ictx->dev_present_intf1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment