diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-05-18 13:40:42 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 14:35:42 +0200 |
| commit | 4ad34da0300d7196be25ef79ef3f054756cdc739 (patch) | |
| tree | 606b0b26f019b1ad459b14c7aafa6d280b6b2072 /drivers/media/video/gspca/zc3xx.c | |
| parent | [media] s5p-fimc: Use selection API in place of crop operations (diff) | |
| download | linux-4ad34da0300d7196be25ef79ef3f054756cdc739.tar.xz linux-4ad34da0300d7196be25ef79ef3f054756cdc739.zip | |
[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) 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 */ |