In 82dfdada40 "pwc: rework locking" we changed the locking so that
we handle it ourselves instead of doing it at the vl42 layer. There
were a couple ioctls, VIDIOCPWCSLED and VIDIOCPWCGLED, where we
didn't unlock on the error path.
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index ad77b23..ea17230 100644
--- a/drivers/media/video/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -840,13 +840,15 @@ long pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
mutex_lock(&pdev->udevlock);
if (!pdev->udev) {
+ mutex_unlock(&pdev->udevlock);
ret = -ENODEV;
- goto leave;
+ break;
}
if (pdev->iso_init) {
+ mutex_unlock(&pdev->udevlock);
ret = -EBUSY;
- goto leave;
+ break;
}
ARG_IN(qual)
@@ -854,7 +856,6 @@ long pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
ret = -EINVAL;
else
ret = pwc_set_video_mode(pdev, pdev->view.x, pdev->view.y, pdev->vframes, ARGR(qual), pdev->vsnapshot);
-leave:
mutex_unlock(&pdev->udevlock);
break;
}
@@ -978,6 +979,7 @@ leave:
mutex_lock(&pdev->udevlock);
if (!pdev->udev) {
+ mutex_unlock(&pdev->udevlock);
ret = -ENODEV;
break;
}
@@ -996,6 +998,7 @@ leave:
mutex_lock(&pdev->udevlock);
if (!pdev->udev) {
+ mutex_unlock(&pdev->udevlock);
ret = -ENODEV;
break;
}
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
