Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 01:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] gspca: the field 'frozen' is under CONFIG_PM

Browse Source 
The gspca_dev field 'frozen' is added only if CONFIG_PM is set. So add the
relevant #ifdef's to various subdrivers that use it.

The m32r daily build caught this mistake.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2012-05-18 08:40:42 -03:00 committed by Mauro Carvalho Chehab
parent fed07f8488
commit 4ad34da030
6 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/video/gspca/finepix.c
View File

@ -94,7 +94,11 @@ static void dostream(struct work_struct *work)
/* loop reading a frame */
again:
while (!gspca_dev->frozen && gspca_dev->dev && gspca_dev->streaming) {
while (gspca_dev->dev && gspca_dev->streaming) {
#ifdef CONFIG_PM
if (gspca_dev->frozen)
break;
#endif
/* request a frame */
mutex_lock(&gspca_dev->usb_lock);
@ -102,8 +106,11 @@ again:
mutex_unlock(&gspca_dev->usb_lock);
if (ret < 0)
break;
if (gspca_dev->frozen || !gspca_dev->dev ||
!gspca_dev->streaming)
#ifdef CONFIG_PM
if (gspca_dev->frozen)
break;
#endif
if (!gspca_dev->dev || !gspca_dev->streaming)
break;
/* the frame comes in parts */
@ -118,8 +125,11 @@ again:
* error. Just restart. */
goto again;
}
if (gspca_dev->frozen || !gspca_dev->dev ||
!gspca_dev->streaming)
#ifdef CONFIG_PM
if (gspca_dev->frozen)
goto out;
#endif
if (!gspca_dev->dev || !gspca_dev->streaming)
goto out;
if (len < FPIX_MAX_TRANSFER ||
(data[len - 2] == 0xff &&

6
drivers/media/video/gspca/jl2005bcd.c
View File

@ -335,7 +335,11 @@ static void jl2005c_dostream(struct work_struct *work)
goto quit_stream;
}
while (!gspca_dev->frozen && gspca_dev->dev && gspca_dev->streaming) {
while (gspca_dev->dev && gspca_dev->streaming) {
#ifdef CONFIG_PM
if (gspca_dev->frozen)
break;
#endif
/* Check if this is a new frame. If so, start the frame first */
if (!header_read) {
mutex_lock(&gspca_dev->usb_lock);

6
drivers/media/video/gspca/sq905.c
View File

@ -232,7 +232,11 @@ static void sq905_dostream(struct work_struct *work)
frame_sz = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].sizeimage
+ FRAME_HEADER_LEN;
while (!gspca_dev->frozen && gspca_dev->dev && gspca_dev->streaming) {
while (gspca_dev->dev && gspca_dev->streaming) {
#ifdef CONFIG_PM
if (gspca_dev->frozen)
break;
#endif
/* request some data and then read it until we have
* a complete frame. */
bytes_left = frame_sz;

6
drivers/media/video/gspca/sq905c.c
View File

@ -150,7 +150,11 @@ static void sq905c_dostream(struct work_struct *work)
goto quit_stream;
}
while (!gspca_dev->frozen && gspca_dev->dev && gspca_dev->streaming) {
while (gspca_dev->dev && gspca_dev->streaming) {
#ifdef CONFIG_PM
if (gspca_dev->frozen)
break;
#endif
/* Request the header, which tells the size to download */
ret = usb_bulk_msg(gspca_dev->dev,
usb_rcvbulkpipe(gspca_dev->dev, 0x81),

6
drivers/media/video/gspca/vicam.c
View File

@ -225,7 +225,11 @@ static void vicam_dostream(struct work_struct *work)
goto exit;
}
while (!gspca_dev->frozen && gspca_dev->dev && gspca_dev->streaming) {
while (gspca_dev->dev && gspca_dev->streaming) {
#ifdef CONFIG_PM
if (gspca_dev->frozen)
break;
#endif
ret = vicam_read_frame(gspca_dev, buffer, frame_sz);
if (ret < 0)
break;

7
drivers/media/video/gspca/zc3xx.c
View File

@ -5946,8 +5946,11 @@ static void transfer_update(struct work_struct *work)
msleep(100);
mutex_lock(&gspca_dev->usb_lock);
if (gspca_dev->frozen || !gspca_dev->dev ||
!gspca_dev->streaming)
#ifdef CONFIG_PM
if (gspca_dev->frozen)
goto err;
#endif
if (!gspca_dev->dev || !gspca_dev->streaming)
goto err;
/* Bit 0 of register 11 indicates FIFO overflow */