summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-09-03 16:48:03 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-03 18:36:51 -0300
commit759aa3c21ebbab6cc00fc4aebd09b3a7d63715d1 (patch)
treeaded46460206d04389557c0ff91c94623496525b /drivers
parent4a18625e88efef2b5a21695edcb2b21d98fdf71b (diff)
downloadblackbird-op-linux-759aa3c21ebbab6cc00fc4aebd09b3a7d63715d1.tar.gz
blackbird-op-linux-759aa3c21ebbab6cc00fc4aebd09b3a7d63715d1.zip
V4L/DVB (8712): gspca: Bad start of sonixj webcams since changeset a8779025e7e8.
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, 2 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index c34e02dccd5c..6673a3edf190 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -59,7 +59,6 @@ struct sd {
#define SENSOR_OV7648 5
#define SENSOR_OV7660 6
unsigned char i2c_base;
- __u8 regf1;
};
/* V4L2 controls supported by the driver */
@@ -929,7 +928,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
sd->bridge = id->driver_info >> 16;
sd->sensor = id->driver_info >> 8;
sd->i2c_base = id->driver_info;
- sd->regf1 = 0; /*jfm: was 1 in v1*/
sd->qindex = 4; /* set the quantization table */
sd->brightness = BRIGHTNESS_DEF;
@@ -982,7 +980,7 @@ static int sd_open(struct gspca_dev *gspca_dev)
break;
}
- reg_w1(gspca_dev, 0xf1, sd->regf1);
+ reg_w1(gspca_dev, 0xf1, 0x01);
return 0;
}
@@ -1346,7 +1344,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
reg_w1(gspca_dev, 0x17, sn9c1xx[0x17]);
reg_w1(gspca_dev, 0x01, sn9c1xx[1]);
reg_w1(gspca_dev, 0x01, data);
- reg_w1(gspca_dev, 0xf1, sd->regf1);
+ reg_w1(gspca_dev, 0xf1, 0x00);
}
static void sd_stop0(struct gspca_dev *gspca_dev)
OpenPOWER on IntegriCloud