2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 7f4b61297175..0979ba62e33a 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/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/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index aa34bf9ea4d9..73d5d5756aef 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/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 {