From b6a4c8bce700a93a6eedf460c60eb320043a7f9a Mon Sep 17 00:00:00 2001 From: Jim Paris Date: Wed, 10 Dec 2008 05:50:44 -0300 Subject: [PATCH] --- yaml --- r: 120029 b: refs/heads/master c: f86d4a9173e47050de9f88faa4aaf70a718791c5 h: refs/heads/master i: 120027: 6f72b8d1009095c4d8481c5037894a9d9d15de14 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/gspca.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9a3eeb0cd57..56c6b935c515 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11c6c7fb89a7526841eb4f294de631f3b8a31f10 +refs/heads/master: f86d4a9173e47050de9f88faa4aaf70a718791c5 diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c index 748a87e82e44..02a6e9ef0337 100644 --- a/trunk/drivers/media/video/gspca/gspca.c +++ b/trunk/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;