From 9a3a6e792b2664651d9ff0261df45a3c28c8a36a Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@linuxtv.org>
Date: Sat, 11 Oct 2008 12:27:06 -0300
Subject: [PATCH] --- yaml --- r: 115628 b: refs/heads/master c:
 a739a7e4c642ebb1ab803fc2c9743aaf1833058b h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/cx23885/cx23885-core.c | 7 +++++++
 trunk/drivers/media/video/cx23885/cx23885.h      | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8c2dad96d5b8..9be6a87cd2a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d782ffa24fc6ce01b3308a0bec5aa5d9d666b568
+refs/heads/master: a739a7e4c642ebb1ab803fc2c9743aaf1833058b
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
index 7f4b61297175..0979ba62e33a 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-core.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -647,6 +647,13 @@ static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *p
 	INIT_LIST_HEAD(&port->frontends.frontend.felist);
 	port->frontends.active_fe_id = 0;
 
+	/* This should be hardcoded allow a single frontend
+	 * attachment to this tsport, keeping the -dvb.c
+	 * code clean and safe.
+	 */
+	if(!port->num_frontends)
+		port->num_frontends = 1;
+
 	switch(portno) {
 	case 1:
 		port->reg_gpcnt          = VID_B_GPCNT;
diff --git a/trunk/drivers/media/video/cx23885/cx23885.h b/trunk/drivers/media/video/cx23885/cx23885.h
index aa34bf9ea4d9..73d5d5756aef 100644
--- a/trunk/drivers/media/video/cx23885/cx23885.h
+++ b/trunk/drivers/media/video/cx23885/cx23885.h
@@ -262,6 +262,9 @@ struct cx23885_tsport {
 	u32                        src_sel_val;
 	u32                        vld_misc_val;
 	u32                        hw_sop_ctrl_val;
+
+	/* Allow a single tsport to have multiple frontends */
+	u32                        num_frontends;
 };
 
 struct cx23885_dev {