diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-05-29 04:46:12 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 19:07:42 -0300 |
| commit | 253f13d5cd05204aa3174ffb53490f2b0fad055c (patch) | |
| tree | 79a4a2f289588bd9cd470e0c8c2ada7563cc319b /drivers/media | |
| parent | df59f0b3df3cc35fa03ea395f5106d1625e3726a (diff) | |
| download | op-kernel-dev-253f13d5cd05204aa3174ffb53490f2b0fad055c.zip op-kernel-dev-253f13d5cd05204aa3174ffb53490f2b0fad055c.tar.gz | |
V4L/DVB (11969): gspca - spca505: Reinitialize the webcam at resume time.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/gspca/spca505.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c index 2acec58..ea8c9fe 100644 --- a/drivers/media/video/gspca/spca505.c +++ b/drivers/media/video/gspca/spca505.c @@ -637,19 +637,19 @@ static int sd_config(struct gspca_dev *gspca_dev, cam->nmodes = ARRAY_SIZE(vga_mode) - 1; sd->brightness = BRIGHTNESS_DEF; - if (sd->subtype == Nxultra) { - if (write_vector(gspca_dev, spca505b_init_data)) - return -EIO; - } else { - if (write_vector(gspca_dev, spca505_init_data)) - return -EIO; - } return 0; } /* this function is called at probe and resume time */ static int sd_init(struct gspca_dev *gspca_dev) { + struct sd *sd = (struct sd *) gspca_dev; + + if (write_vector(gspca_dev, + sd->subtype == Nxultra + ? spca505b_init_data + : spca505_init_data)) + return -EIO; return 0; } |
