4 files changed, 8 insertions, 2 deletions

diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index e564a61a72d7..48892b5715d5 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -102,7 +102,11 @@ int s5k4aa_probe(struct sd *sd)
         }
 
         /* Test some registers, but we don't know their exact meaning yet */
-        if (m5602_read_sensor(sd, 0x00, prod_id, sizeof(prod_id)))
+        if (m5602_read_sensor(sd, 0x00, prod_id, 2))
+                return -ENODEV;
+        if (m5602_read_sensor(sd, 0x02, prod_id+2, 2))
+                return -ENODEV;
+        if (m5602_read_sensor(sd, 0x04, prod_id+4, 2))
                 return -ENODEV;
 
         if (memcmp(prod_id, expected_prod_id, sizeof(prod_id)))
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 0776ecf56d27..b5370b3e1a3d 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -860,6 +860,7 @@ static struct zl10353_config behold_h6_config = {
         .demod_address = 0x1e>>1,
         .no_tuner      = 1,
         .parallel_ts   = 1,
+        .disable_i2c_gate_ctrl = 1,
 };
 
 /* ==================================================================
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 5aeccb301cea..076ed5bf48b1 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -54,7 +54,7 @@ MODULE_LICENSE("GPL");
 /* ---------------------------------------------------------------------- */
 /* our structs                                                            */
 
-#define MAXREGS 64
+#define MAXREGS 256
 
 struct CHIPSTATE;
 typedef int  (*getvalue)(int);
diff --git a/drivers/media/video/zoran/Kconfig b/drivers/media/video/zoran/Kconfig
index 4ea5fa71de89..8666e19f31a7 100644
--- a/drivers/media/video/zoran/Kconfig
+++ b/drivers/media/video/zoran/Kconfig
@@ -68,6 +68,7 @@ config VIDEO_ZORAN_AVS6EYES
         tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"
         depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1
         select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_BT866 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO
         help
           Support for the AverMedia 6 Eyes video surveillance card.