diff options
| author | Jarod Wilson <jarod@redhat.com> | 2010-07-26 11:11:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-08 23:42:57 -0300 |
| commit | 20cd19597238723237d214dbab18c0b7c68c5814 (patch) | |
| tree | ea0501a875877ae901bf6af82c3e01679f7c27ff /drivers/media/IR | |
| parent | d69e85b644dbc8c68dec3b4149941989d4bcc66f (diff) | |
V4L/DVB: IR/imon: remove incorrect calls to input_free_device
Per Dmitry Torokhov, following input_unregister_device with an
input_free_device is forbidden, the former is sufficient alone.
Acked-by: Dmitry Torokhov <dtor@mail.ru>
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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c index 65c125e44e96..a665d48bed47 100644 --- a/drivers/media/IR/imon.c +++ b/drivers/media/IR/imon.c @@ -1944,7 +1944,6 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf) urb_submit_failed: ir_input_unregister(ictx->idev); - input_free_device(ictx->idev); idev_setup_failed: find_endpoint_failed: mutex_unlock(&ictx->lock); @@ -2014,10 +2013,8 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf, return ictx; urb_submit_failed: - if (ictx->touch) { + if (ictx->touch) input_unregister_device(ictx->touch); - input_free_device(ictx->touch); - } touch_setup_failed: find_endpoint_failed: mutex_unlock(&ictx->lock); |