diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-15 10:06:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-15 10:06:26 -0300 |
| commit | 19feaccb78f2227bb372389fe38dcdafa0880bb0 (patch) | |
| tree | f04a4b38b95d67e5c411fffa225157b5b317632e /linux/drivers/media/video/gspca/spca505.c | |
| parent | 1da56a9b1c063bd04bef7d30ef5b65ea985d60db (diff) | |
| parent | 879c3f325297edbca0f8b42980832b2ffb585f78 (diff) | |
| download | mediapointer-dvb-s2-19feaccb78f2227bb372389fe38dcdafa0880bb0.tar.gz mediapointer-dvb-s2-19feaccb78f2227bb372389fe38dcdafa0880bb0.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/spca505.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/spca505.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/video/gspca/spca505.c b/linux/drivers/media/video/gspca/spca505.c index 2acec58b1..ea8c9fe2e 100644 --- a/linux/drivers/media/video/gspca/spca505.c +++ b/linux/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; } |