From 9ca3a2428f5f392ac06847dccd2dd40c53cd122a Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Tue, 12 Jan 2010 07:12:43 -0300 Subject: [PATCH] --- yaml --- r: 181479 b: refs/heads/master c: eac8f5fa5f5dcaf228694fe23e19b02b98e68879 h: refs/heads/master i: 181477: a49287c5fdce1763e5ef9679462c6e059705ab71 181475: 12730ade11f9a4d6ae447d66b921dad174e77aaa 181471: 83434ab7387c1d412d2b8c658a987e29505f5d7d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/sonixj.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 44e215cbaded..1afcfce8be39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdf955cd8e45d8279c53b47a2c0e0c5decaaca86 +refs/heads/master: eac8f5fa5f5dcaf228694fe23e19b02b98e68879 diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c index 8e4a627dc83f..4ece1109d399 100644 --- a/trunk/drivers/media/video/gspca/sonixj.c +++ b/trunk/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;