summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/gspca/zc3xx.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-09-09 07:30:02 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-13 17:52:58 -0300
commit844db450e6e2cf710752af1a019a877af390b541 (patch)
tree0c43bce1f503d14cabdad012ff00b6a9c6ad41b8 /drivers/media/usb/gspca/zc3xx.c
parentff8f25d326da5e7cf6216f368116744341fceb12 (diff)
[media] gspca: Update / fix various comments wrt workqueue usb_lock usage
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/gspca/zc3xx.c')
-rw-r--r--drivers/media/usb/gspca/zc3xx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c
index 234d9eaa8ee..c47ba14c761 100644
--- a/drivers/media/usb/gspca/zc3xx.c
+++ b/drivers/media/usb/gspca/zc3xx.c
@@ -5945,6 +5945,7 @@ static void transfer_update(struct work_struct *work)
for (;;) {
msleep(100);
+ /* To protect gspca_dev->usb_buf and gspca_dev->usb_err */
mutex_lock(&gspca_dev->usb_lock);
#ifdef CONFIG_PM
if (gspca_dev->frozen)
@@ -6831,7 +6832,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
return 0;
}
-/* called on streamoff with alt 0 and on disconnect */
+/* called on streamoff with alt==0 and on disconnect */
+/* the usb_lock is held at entry - restore on exit */
static void sd_stop0(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;