summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJean-Francois Moine2008-07-17 14:37:57 +0200
committerMauro Carvalho Chehab2008-07-20 12:27:28 +0200
commit1ff1e48442188b9ae68aef82b66baef89e988cf6 (patch)
tree4b1275d04ca4f49b0a495450736ee69783840b2c /drivers/media
parentV4L/DVB (8367): gspca: Light frequency filter / exposure / clean-up for sn9c1... (diff)
downloadkernel-qcow2-linux-1ff1e48442188b9ae68aef82b66baef89e988cf6.tar.gz
kernel-qcow2-linux-1ff1e48442188b9ae68aef82b66baef89e988cf6.tar.xz
kernel-qcow2-linux-1ff1e48442188b9ae68aef82b66baef89e988cf6.zip
V4L/DVB (8369): gspca: Bad initialization of sn9c102 ov7630.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/sonixb.c2
-rw-r--r--drivers/media/video/gspca/vc032x.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 045ed6b7d053..f1b16d4451f2 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -938,7 +938,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/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index dd7c1389f38d..fcf2c9e32573 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -925,14 +925,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] = {