From: Jarod Wilson Date: Wed, 16 Jun 2010 20:07:39 +0000 (-0300) Subject: V4L/DVB: IR/imon: use the proper ir-core device unregister function X-Git-Tag: v2.6.36-rc1~582^2~158 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8a3fa8129cd90a05b1a79d949e57dcd194520174;p=karo-tx-linux.git V4L/DVB: IR/imon: use the proper ir-core device unregister function Was using input_unregister_device directly, instead of using ir_input_unregister, which tears down a bunch of other things in addition to eventually calling input_unregister_device. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c index 4bbd45f4284c..d13a79eca777 100644 --- a/drivers/media/IR/imon.c +++ b/drivers/media/IR/imon.c @@ -1943,7 +1943,7 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf) return ictx; urb_submit_failed: - input_unregister_device(ictx->idev); + ir_input_unregister(ictx->idev); input_free_device(ictx->idev); idev_setup_failed: find_endpoint_failed: @@ -2306,7 +2306,7 @@ static void __devexit imon_disconnect(struct usb_interface *interface) if (ifnum == 0) { ictx->dev_present_intf0 = false; usb_kill_urb(ictx->rx_urb_intf0); - input_unregister_device(ictx->idev); + ir_input_unregister(ictx->idev); if (ictx->display_supported) { if (ictx->display_type == IMON_DISPLAY_TYPE_LCD) usb_deregister_dev(interface, &imon_lcd_class);