From e5700ed5a34b3b07c7a085fd43eb6bc6575d577b Mon Sep 17 00:00:00 2001
From: Dmitry Belimov <d.belimov@gmail.com>
Date: Tue, 26 Aug 2008 13:44:40 -0300
Subject: [PATCH] --- yaml --- r: 113871 b: refs/heads/master c:
 f03813e4d1900b619d4cb133506b130e535614f0 h: refs/heads/master i:   113869:
 b326ac249fdc00c5f9d29790c586087ec43edf2a   113867:
 685daeb450b448c2324d72767e2da3d40ba505ec   113863:
 948e804fa7ae22f43a85044e0aba5270789dac36   113855:
 9be43e4b47721a67d9693219b4855afffa6ed4f2 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/video/saa7134/saa6752hs.c   | 17 +++++++++++------
 .../media/video/saa7134/saa7134-empress.c       | 15 ++++++++++++---
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 46acf23fba17..30c7bd4df2a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d95af9d09d537d287eea9914c0d1ca4cfa0ec7f
+refs/heads/master: f03813e4d1900b619d4cb133506b130e535614f0
diff --git a/trunk/drivers/media/video/saa7134/saa6752hs.c b/trunk/drivers/media/video/saa7134/saa6752hs.c
index 28499e591925..f40cb0b479b1 100644
--- a/trunk/drivers/media/video/saa7134/saa6752hs.c
+++ b/trunk/drivers/media/video/saa7134/saa6752hs.c
@@ -653,7 +653,7 @@ static int saa6752hs_qmenu(struct saa6752hs_state *h,
 	return v4l2_ctrl_query_menu(qmenu, &qctrl, NULL);
 }
 
-static int saa6752hs_init(struct i2c_client* client)
+static int saa6752hs_init(struct i2c_client *client, u32 leading_null_bytes)
 {
 	unsigned char buf[9], buf2[4];
 	struct saa6752hs_state *h;
@@ -705,6 +705,12 @@ static int saa6752hs_init(struct i2c_client* client)
 	buf[1] = 0x05;
 	i2c_master_send(client,buf,2);
 
+	/* Set leading null byte for TS */
+	buf[0] = 0xF6;
+	buf[1] = (leading_null_bytes >> 8) & 0xff;
+	buf[2] = leading_null_bytes & 0xff;
+	i2c_master_send(client, buf, 3);
+
 	/* compute PAT */
 	memcpy(localPAT, PAT, sizeof(PAT));
 	localPAT[17] = 0xe0 | ((h->params.ts_pid_pmt >> 8) & 0x0f);
@@ -812,14 +818,13 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	int i;
 
 	switch (cmd) {
+	case VIDIOC_INT_INIT:
+		/* apply settings and start encoder */
+		saa6752hs_init(client, *(u32 *)arg);
+		break;
 	case VIDIOC_S_EXT_CTRLS:
 		if (ctrls->ctrl_class != V4L2_CTRL_CLASS_MPEG)
 			return -EINVAL;
-		if (ctrls->count == 0) {
-			/* apply settings and start encoder */
-			saa6752hs_init(client);
-			break;
-		}
 		/* fall through */
 	case VIDIOC_TRY_EXT_CTRLS:
 	case VIDIOC_G_EXT_CTRLS:
diff --git a/trunk/drivers/media/video/saa7134/saa7134-empress.c b/trunk/drivers/media/video/saa7134/saa7134-empress.c
index f5a186a13db2..946edf64dc28 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-empress.c
+++ b/trunk/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;
 }