diff options
author | Jarod Wilson <jarod@redhat.com> | 2010-07-26 10:11:36 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-08 22:42:57 -0400 |
commit | 20cd19597238723237d214dbab18c0b7c68c5814 (patch) | |
tree | ea0501a875877ae901bf6af82c3e01679f7c27ff /drivers/media/IR/imon.c | |
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/imon.c')
-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) | |||
1944 | 1944 | ||
1945 | urb_submit_failed: | 1945 | urb_submit_failed: |
1946 | ir_input_unregister(ictx->idev); | 1946 | ir_input_unregister(ictx->idev); |
1947 | input_free_device(ictx->idev); | ||
1948 | idev_setup_failed: | 1947 | idev_setup_failed: |
1949 | find_endpoint_failed: | 1948 | find_endpoint_failed: |
1950 | mutex_unlock(&ictx->lock); | 1949 | mutex_unlock(&ictx->lock); |
@@ -2014,10 +2013,8 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf, | |||
2014 | return ictx; | 2013 | return ictx; |
2015 | 2014 | ||
2016 | urb_submit_failed: | 2015 | urb_submit_failed: |
2017 | if (ictx->touch) { | 2016 | if (ictx->touch) |
2018 | input_unregister_device(ictx->touch); | 2017 | input_unregister_device(ictx->touch); |
2019 | input_free_device(ictx->touch); | ||
2020 | } | ||
2021 | touch_setup_failed: | 2018 | touch_setup_failed: |
2022 | find_endpoint_failed: | 2019 | find_endpoint_failed: |
2023 | mutex_unlock(&ictx->lock); | 2020 | mutex_unlock(&ictx->lock); |