diff options
Diffstat (limited to 'drivers/media/usb/gspca/zc3xx.c')
-rw-r--r-- | drivers/media/usb/gspca/zc3xx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c index 234d9eaa8eea..c47ba14c7619 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) | |||
5945 | for (;;) { | 5945 | for (;;) { |
5946 | msleep(100); | 5946 | msleep(100); |
5947 | 5947 | ||
5948 | /* To protect gspca_dev->usb_buf and gspca_dev->usb_err */ | ||
5948 | mutex_lock(&gspca_dev->usb_lock); | 5949 | mutex_lock(&gspca_dev->usb_lock); |
5949 | #ifdef CONFIG_PM | 5950 | #ifdef CONFIG_PM |
5950 | if (gspca_dev->frozen) | 5951 | if (gspca_dev->frozen) |
@@ -6831,7 +6832,8 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
6831 | return 0; | 6832 | return 0; |
6832 | } | 6833 | } |
6833 | 6834 | ||
6834 | /* called on streamoff with alt 0 and on disconnect */ | 6835 | /* called on streamoff with alt==0 and on disconnect */ |
6836 | /* the usb_lock is held at entry - restore on exit */ | ||
6835 | static void sd_stop0(struct gspca_dev *gspca_dev) | 6837 | static void sd_stop0(struct gspca_dev *gspca_dev) |
6836 | { | 6838 | { |
6837 | struct sd *sd = (struct sd *) gspca_dev; | 6839 | struct sd *sd = (struct sd *) gspca_dev; |