diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2010-01-12 05:12:43 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:10:32 -0500 |
commit | eac8f5fa5f5dcaf228694fe23e19b02b98e68879 (patch) | |
tree | de287a2f92a38cd5fffb59ab0c8ef7b492a6d9d7 /drivers/media/video/gspca/sonixj.c | |
parent | cdf955cd8e45d8279c53b47a2c0e0c5decaaca86 (diff) |
V4L/DVB (13927): gspca - sonixj: Fix bad video mode for all webcams.
The bug was introduced when adding the sensor adcm1700.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/sonixj.c')
-rw-r--r-- | drivers/media/video/gspca/sonixj.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 8e4a627dc83f..4ece1109d399 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -1447,6 +1447,9 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
1447 | struct sd *sd = (struct sd *) gspca_dev; | 1447 | struct sd *sd = (struct sd *) gspca_dev; |
1448 | struct cam *cam; | 1448 | struct cam *cam; |
1449 | 1449 | ||
1450 | sd->bridge = id->driver_info >> 16; | ||
1451 | sd->sensor = id->driver_info; | ||
1452 | |||
1450 | cam = &gspca_dev->cam; | 1453 | cam = &gspca_dev->cam; |
1451 | if (sd->sensor == SENSOR_ADCM1700) { | 1454 | if (sd->sensor == SENSOR_ADCM1700) { |
1452 | cam->cam_mode = cif_mode; | 1455 | cam->cam_mode = cif_mode; |
@@ -1457,9 +1460,6 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
1457 | } | 1460 | } |
1458 | cam->npkt = 24; /* 24 packets per ISOC message */ | 1461 | cam->npkt = 24; /* 24 packets per ISOC message */ |
1459 | 1462 | ||
1460 | sd->bridge = id->driver_info >> 16; | ||
1461 | sd->sensor = id->driver_info; | ||
1462 | |||
1463 | sd->brightness = BRIGHTNESS_DEF; | 1463 | sd->brightness = BRIGHTNESS_DEF; |
1464 | sd->contrast = CONTRAST_DEF; | 1464 | sd->contrast = CONTRAST_DEF; |
1465 | sd->colors = COLOR_DEF; | 1465 | sd->colors = COLOR_DEF; |