V4L/DVB (8795): saa7134-empress: insert leading null bytes for Beholder M6 empress cards

Additional code to improve the init sequence and add board type tests
were done by Hans Verkuil.

Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index f5a186a13db2..946edf64dc28 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -64,10 +64,19 @@ static void ts_reset_encoder(struct saa7134_dev* dev)
 
 static int ts_init_encoder(struct saa7134_dev* dev)
 {
-        struct v4l2_ext_controls ctrls = { V4L2_CTRL_CLASS_MPEG, 0 };
-
+        u32 leading_null_bytes = 0;
+
+        /* If more cards start to need this, then this
+           should probably be added to the card definitions. */
+        switch (dev->board) {
+        case SAA7134_BOARD_BEHOLD_M6:
+        case SAA7134_BOARD_BEHOLD_M63:
+        case SAA7134_BOARD_BEHOLD_M6_EXTRA:
+                leading_null_bytes = 1;
+                break;
+        }
         ts_reset_encoder(dev);
-        saa7134_i2c_call_clients(dev, VIDIOC_S_EXT_CTRLS, &ctrls);
+        saa7134_i2c_call_clients(dev, VIDIOC_INT_INIT, &leading_null_bytes);
         dev->empress_started = 1;
         return 0;
 }