From 8b4f88f31e04ea6ba6e688d6958fb060ce7f7b03 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 2 Nov 2007 11:54:18 -0300
Subject: [PATCH] --- yaml --- r: 192670 b: refs/heads/master c:
 0ef4b05a4f7610182174c09616aa930bbd990435 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/tm6000/tm6000-stds.c | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86a013f348b6..a772b76ae107 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc27a8c275ff5a1d2b7cffbb5b8e96509d4231b9
+refs/heads/master: 0ef4b05a4f7610182174c09616aa930bbd990435
diff --git a/trunk/drivers/staging/tm6000/tm6000-stds.c b/trunk/drivers/staging/tm6000/tm6000-stds.c
index d74793a8d596..11e600bdc41b 100644
--- a/trunk/drivers/staging/tm6000/tm6000-stds.c
+++ b/trunk/drivers/staging/tm6000/tm6000-stds.c
@@ -781,6 +781,13 @@ static int tm6000_load_std(struct tm6000_core *dev,
 		if (!set[i].req)
 			return 0;
 
+		/* FIXME: REQ 8 settings are for tm6010
+			not tested yet
+			This doesn't work with tm5600
+		*/
+		if (set[i].req == REQ_08_SET_GET_AVREG_BIT)
+			continue;
+
 		rc = tm6000_set_reg(dev, set[i].req, set[i].reg, set[i].value);
 		if (rc < 0) {
 			printk(KERN_ERR "Error %i while setting "
@@ -797,6 +804,22 @@ static int tm6000_set_tv(struct tm6000_core *dev, int pos)
 {
 	int rc;
 
+	/* FIXME: This code is for tm6010 - not tested yet - doesn't work with
+	   tm5600
+	 */
+
+	/* FIXME: This is tuner-dependent */
+	int nosif = 0;
+
+	if (nosif) {
+		rc = tm6000_load_std(dev, tv_stds[pos].nosif,
+				     sizeof(tv_stds[pos].nosif));
+	} else {
+		rc = tm6000_load_std(dev, tv_stds[pos].sif,
+				     sizeof(tv_stds[pos].sif));
+	}
+	if (rc < 0)
+		return rc;
 	rc = tm6000_load_std(dev, tv_stds[pos].common,
 			     sizeof(tv_stds[pos].common));