From ef5b642b7d600088dd0cb81016fd9df9295e312f Mon Sep 17 00:00:00 2001
From: "Igor M. Liplianin" <liplianin@me.by>
Date: Tue, 25 Jan 2011 17:06:00 -0300
Subject: [PATCH] --- yaml --- r: 241919 b: refs/heads/master c:
 10d0dcd73c619d86b8ba1c9cd753ce749f578bf4 h: refs/heads/master i:   241917:
 13a761b13a4ee06a2c630c62da6de0438928bbe5   241915:
 002434bc7293db89cdd124c4736d7a0dcdd32046   241911:
 298bc2b6ab2992f83349298382b324f6da2f3122   241903:
 911f4bd2e9d8f33288e9091bac526139b5e2c15e   241887:
 accb264adb7cacc158e57e44a63094c10bae7b27   241855:
 d1566f4643c216ad8355a1ddf741dd64357e4a3f   241791:
 65a31bf80c1dfe75fbac882072950bcdf5561662   241663:
 83152cc060e8515b41cdeca93ae672cd223af763 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/cx23885/cx23885-cards.c | 2 ++
 trunk/drivers/media/video/cx23885/cx23885-core.c  | 6 ++++++
 trunk/drivers/media/video/cx23885/cx23885.h       | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c69bedc7148e..62f8dfc7faf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 557f48d5720b45dae07788bc9976762c363b8ad0
+refs/heads/master: 10d0dcd73c619d86b8ba1c9cd753ce749f578bf4
diff --git a/trunk/drivers/media/video/cx23885/cx23885-cards.c b/trunk/drivers/media/video/cx23885/cx23885-cards.c
index fb2045af499f..ea88722cb4ab 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-cards.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-cards.c
@@ -344,6 +344,8 @@ struct cx23885_board cx23885_boards[] = {
 		.porta		= CX23885_ANALOG_VIDEO,
 		.portb		= CX23885_MPEG_DVB,
 		.portc		= CX23885_MPEG_DVB,
+		.num_fds_portb	= 2,
+		.num_fds_portc	= 2,
 		.tuner_type	= TUNER_XC5000,
 		.tuner_addr	= 0x64,
 		.input          = { {
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
index d621d76f3a9a..d778b1ae9217 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-core.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -1005,6 +1005,9 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 	}
 
 	if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) {
+		if (cx23885_boards[dev->board].num_fds_portb)
+			dev->ts1.num_frontends =
+				cx23885_boards[dev->board].num_fds_portb;
 		if (cx23885_dvb_register(&dev->ts1) < 0) {
 			printk(KERN_ERR "%s() Failed to register dvb adapters on VID_B\n",
 			       __func__);
@@ -1019,6 +1022,9 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 	}
 
 	if (cx23885_boards[dev->board].portc == CX23885_MPEG_DVB) {
+		if (cx23885_boards[dev->board].num_fds_portc)
+			dev->ts2.num_frontends =
+				cx23885_boards[dev->board].num_fds_portc;
 		if (cx23885_dvb_register(&dev->ts2) < 0) {
 			printk(KERN_ERR
 				"%s() Failed to register dvb on VID_C\n",
diff --git a/trunk/drivers/media/video/cx23885/cx23885.h b/trunk/drivers/media/video/cx23885/cx23885.h
index d8c76b05e4d7..8db2797bc7c3 100644
--- a/trunk/drivers/media/video/cx23885/cx23885.h
+++ b/trunk/drivers/media/video/cx23885/cx23885.h
@@ -205,6 +205,7 @@ typedef enum {
 struct cx23885_board {
 	char                    *name;
 	port_t			porta, portb, portc;
+	int		num_fds_portb, num_fds_portc;
 	unsigned int		tuner_type;
 	unsigned int		radio_type;
 	unsigned char		tuner_addr;