summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJim Paris <jim@jtan.com>2008-12-10 05:50:44 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-16 16:43:58 -0200
commitf86d4a9173e47050de9f88faa4aaf70a718791c5 (patch)
treed9b48406f2f1a454c6a40666a83bc10bccb0827f /drivers/media
parent11c6c7fb89a7526841eb4f294de631f3b8a31f10 (diff)
downloadop-kernel-dev-f86d4a9173e47050de9f88faa4aaf70a718791c5.zip
op-kernel-dev-f86d4a9173e47050de9f88faa4aaf70a718791c5.tar.gz
V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
Signed-off-by: Jim Paris <jim@jtan.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/gspca.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 748a87e..02a6e9e 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1264,10 +1264,10 @@ static int vidioc_s_jpegcomp(struct file *file, void *priv,
struct gspca_dev *gspca_dev = priv;
int ret;
- if (mutex_lock_interruptible(&gspca_dev->usb_lock))
- return -ERESTARTSYS;
if (!gspca_dev->sd_desc->set_jcomp)
return -EINVAL;
+ if (mutex_lock_interruptible(&gspca_dev->usb_lock))
+ return -ERESTARTSYS;
ret = gspca_dev->sd_desc->set_jcomp(gspca_dev, jpegcomp);
mutex_unlock(&gspca_dev->usb_lock);
return ret;
OpenPOWER on IntegriCloud