diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2009-05-29 03:46:12 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:07:42 -0400 |
commit | 253f13d5cd05204aa3174ffb53490f2b0fad055c (patch) | |
tree | 79a4a2f289588bd9cd470e0c8c2ada7563cc319b /drivers/media | |
parent | df59f0b3df3cc35fa03ea395f5106d1625e3726a (diff) |
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 2acec58b1b97..ea8c9fe2e961 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, | |||
637 | cam->nmodes = ARRAY_SIZE(vga_mode) - 1; | 637 | cam->nmodes = ARRAY_SIZE(vga_mode) - 1; |
638 | sd->brightness = BRIGHTNESS_DEF; | 638 | sd->brightness = BRIGHTNESS_DEF; |
639 | 639 | ||
640 | if (sd->subtype == Nxultra) { | ||
641 | if (write_vector(gspca_dev, spca505b_init_data)) | ||
642 | return -EIO; | ||
643 | } else { | ||
644 | if (write_vector(gspca_dev, spca505_init_data)) | ||
645 | return -EIO; | ||
646 | } | ||
647 | return 0; | 640 | return 0; |
648 | } | 641 | } |
649 | 642 | ||
650 | /* this function is called at probe and resume time */ | 643 | /* this function is called at probe and resume time */ |
651 | static int sd_init(struct gspca_dev *gspca_dev) | 644 | static int sd_init(struct gspca_dev *gspca_dev) |
652 | { | 645 | { |
646 | struct sd *sd = (struct sd *) gspca_dev; | ||
647 | |||
648 | if (write_vector(gspca_dev, | ||
649 | sd->subtype == Nxultra | ||
650 | ? spca505b_init_data | ||
651 | : spca505_init_data)) | ||
652 | return -EIO; | ||
653 | return 0; | 653 | return 0; |
654 | } | 654 | } |
655 | 655 | ||