summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2010-01-12 13:12:43 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 21:10:32 +0300
commiteac8f5fa5f5dcaf228694fe23e19b02b98e68879 (patch)
treede287a2f92a38cd5fffb59ab0c8ef7b492a6d9d7 /drivers
parentcdf955cd8e45d8279c53b47a2c0e0c5decaaca86 (diff)
downloadlinux-eac8f5fa5f5dcaf228694fe23e19b02b98e68879.tar.xz
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')
-rw-r--r--drivers/media/video/gspca/sonixj.c6
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,
struct sd *sd = (struct sd *) gspca_dev;
struct cam *cam;
+ sd->bridge = id->driver_info >> 16;
+ sd->sensor = id->driver_info;
+
cam = &gspca_dev->cam;
if (sd->sensor == SENSOR_ADCM1700) {
cam->cam_mode = cif_mode;
@@ -1457,9 +1460,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
}
cam->npkt = 24; /* 24 packets per ISOC message */
- sd->bridge = id->driver_info >> 16;
- sd->sensor = id->driver_info;
-
sd->brightness = BRIGHTNESS_DEF;
sd->contrast = CONTRAST_DEF;
sd->colors = COLOR_DEF;