summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-07-17 11:37:57 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-07-17 11:37:57 +0200
commit296e13f821bc511305715d06888147bc781b2f40 (patch)
tree5c72efdfece4f870566feb452851e0bda7134c7a /linux/drivers/media
parentf4b6f27da34d8971eb4b59324c15e94bd062ed21 (diff)
downloadmediapointer-dvb-s2-296e13f821bc511305715d06888147bc781b2f40.tar.gz
mediapointer-dvb-s2-296e13f821bc511305715d06888147bc781b2f40.tar.bz2
gspca: Bad initialization of sn9c102 ov7630.
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/gspca/sonixb.c9
-rw-r--r--linux/drivers/media/video/gspca/vc032x.c4
2 files changed, 10 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/sonixb.c b/linux/drivers/media/video/gspca/sonixb.c
index 255d12c5a..983e921a3 100644
--- a/linux/drivers/media/video/gspca/sonixb.c
+++ b/linux/drivers/media/video/gspca/sonixb.c
@@ -274,10 +274,17 @@ static const __u8 ov6650_sensor_init[][8] =
static const __u8 initOv7630[] = {
0x04, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* r01 .. r08 */
0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* r09 .. r10 */
+#if 1
0x00, 0x02, 0x01, 0x0a, /* r11 .. r14 */
0x28, 0x1e, /* H & V sizes r15 .. r16 */
0x68, COMP1, MCK_INIT1, /* r17 .. r19 */
0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c /* r1a .. r1f */
+#else /* jfm from win */
+ 0x00, 0x01, 0x01, 0x0a, /* r11 .. r14 */
+ 0x16, 0x12, /* H & V sizes r15 .. r16 */
+ 0x68, COMP2, MCK_INIT1, /* r17 .. r19 */
+ 0x1d, 0x10, 0x06, 0x01, 0x00, 0x03 /* r1a .. r1f */
+#endif
};
static const __u8 initOv7630_3[] = {
0x44, 0x44, 0x00, 0x1a, 0x20, 0x20, 0x20, 0x80, /* r01 .. r08 */
@@ -964,7 +971,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
case SENSOR_OV7630:
reg01 = 0x06;
reg17 = 0x29;
- l = 0x10;
+ l = sizeof initOv7630;
break;
case SENSOR_OV7630_3:
reg01 = 0x44;
diff --git a/linux/drivers/media/video/gspca/vc032x.c b/linux/drivers/media/video/gspca/vc032x.c
index 5960b2577..2410a1f77 100644
--- a/linux/drivers/media/video/gspca/vc032x.c
+++ b/linux/drivers/media/video/gspca/vc032x.c
@@ -934,14 +934,14 @@ static const __u8 ov7660_initQVGA_data[][4] = {
{0xb8, 0x8f, 0xff, 0xcc}, /* ff */
{0x00, 0x29, 0x3c, 0xaa},
{0xb3, 0x01, 0x45, 0xcc}, /* 45 */
- {0x00, 0x00, 0x00, 0x00}
+ {}
};
static const __u8 ov7660_50HZ[][4] = {
{0x00, 0x3b, 0x08, 0xaa},
{0x00, 0x9d, 0x40, 0xaa},
{0x00, 0x13, 0xa7, 0xaa},
- {0x00, 0x00, 0x00, 0x00}
+ {}
};
static const __u8 ov7660_60HZ[][4] = {