Skip to content

Commit

Permalink
V4L/DVB: IR/imon: remove incorrect calls to input_free_device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jarod Wilson authored and Mauro Carvalho Chehab committed Aug 9, 2010
1 parent d69e85b commit 20cd195
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/media/IR/imon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 20cd195

Please sign in to comment.