diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-05-18 07:40:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 08:35:42 -0400 |
commit | 4ad34da0300d7196be25ef79ef3f054756cdc739 (patch) | |
tree | 606b0b26f019b1ad459b14c7aafa6d280b6b2072 /drivers/media/video/gspca/zc3xx.c | |
parent | fed07f848888267d5991b9446e103f35aaeb58d8 (diff) |
[media] gspca: the field 'frozen' is under CONFIG_PM
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>
Diffstat (limited to 'drivers/media/video/gspca/zc3xx.c')
-rw-r--r-- | drivers/media/video/gspca/zc3xx.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index 0d504a7c512c..f0bacee33ef9 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
@@ -5946,8 +5946,11 @@ static void transfer_update(struct work_struct *work) | |||
5946 | msleep(100); | 5946 | msleep(100); |
5947 | 5947 | ||
5948 | mutex_lock(&gspca_dev->usb_lock); | 5948 | mutex_lock(&gspca_dev->usb_lock); |
5949 | if (gspca_dev->frozen || !gspca_dev->dev || | 5949 | #ifdef CONFIG_PM |
5950 | !gspca_dev->streaming) | 5950 | if (gspca_dev->frozen) |
5951 | goto err; | ||
5952 | #endif | ||
5953 | if (!gspca_dev->dev || !gspca_dev->streaming) | ||
5951 | goto err; | 5954 | goto err; |
5952 | 5955 | ||
5953 | /* Bit 0 of register 11 indicates FIFO overflow */ | 5956 | /* Bit 0 of register 11 indicates FIFO overflow */ |