]> git.karo-electronics.de Git - linux-beck.git/commitdiff
V4L/DVB: IR/imon: use the proper ir-core device unregister function
authorJarod Wilson <jarod@redhat.com>
Wed, 16 Jun 2010 20:07:39 +0000 (17:07 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 2 Aug 2010 17:55:30 +0000 (14:55 -0300)
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 <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/IR/imon.c

index 4bbd45f4284c37b53c1169b95f250a1eaf44d01b..d13a79eca77755316fd83057630552d08ba62603 100644 (file)
@@ -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);