From: Jarod Wilson Date: Mon, 26 Jul 2010 14:11:36 +0000 (-0300) Subject: V4L/DVB: IR/imon: remove incorrect calls to input_free_device X-Git-Tag: v2.6.36-rc1~289^2~60 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=20cd19597238723237d214dbab18c0b7c68c5814;p=karo-tx-linux.git 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 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 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);