summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-cards.c
diff options
context:
space:
mode:
authorDan Carpenter2010-11-18 04:56:37 +0100
committerMauro Carvalho Chehab2010-12-29 11:16:57 +0100
commit5ae094cea1b4f3715ee6ea4f49d0b36d564f90e7 (patch)
tree1cdf53ec82ba82127508aa5a710c9a5b78bd4f9f /drivers/media/video/cx231xx/cx231xx-cards.c
parent[media] rc: fix sysfs entry for mceusb and streamzap (diff)
downloadkernel-qcow2-linux-5ae094cea1b4f3715ee6ea4f49d0b36d564f90e7.tar.gz
kernel-qcow2-linux-5ae094cea1b4f3715ee6ea4f49d0b36d564f90e7.tar.xz
kernel-qcow2-linux-5ae094cea1b4f3715ee6ea4f49d0b36d564f90e7.zip
[media] cx231xx: stray unlock on error path
The lock isn't held here and doesn't need to be unlocked. The code has been like this since the driver was merged. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-cards.c')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-cards.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 2b6101763355..61756502c085 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -784,7 +784,7 @@ static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev,
retval = cx231xx_register_analog_devices(dev);
if (retval < 0) {
cx231xx_release_resources(dev);
- goto fail_reg_devices;
+ return retval;
}
cx231xx_ir_init(dev);
@@ -792,10 +792,6 @@ static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev,
cx231xx_init_extension(dev);
return 0;
-
-fail_reg_devices:
- mutex_unlock(&dev->lock);
- return retval;
}
#if defined(CONFIG_MODULES) && defined(MODULE)