diff options
| author | Jarod Wilson <jarod@redhat.com> | 2010-06-16 20:07:39 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 17:55:30 (GMT) |
| commit | 8a3fa8129cd90a05b1a79d949e57dcd194520174 (patch) | |
| tree | 1de81e89d732cf3f32d7fca8424ce71e32a69d7a /drivers/media/IR | |
| parent | 2135436af139ac3d11645dd77d5c788a045a096f (diff) | |
| download | linux-fsl-qoriq-8a3fa8129cd90a05b1a79d949e57dcd194520174.tar.xz | |
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 <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR')
| -rw-r--r-- | drivers/media/IR/imon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c index 4bbd45f..d13a79e 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); |