From: Jean-Francois Moine Date: Tue, 12 Jan 2010 10:12:43 +0000 (-0300) Subject: V4L/DVB (13927): gspca - sonixj: Fix bad video mode for all webcams. X-Git-Tag: v2.6.34-rc1~280^2~291 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eac8f5fa5f5dcaf228694fe23e19b02b98e68879;p=~emulex%2Finfiniband.git 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 8e4a627dc83..4ece1109d39 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;