diff options
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-core.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c index 74df1f92a..6fc69988a 100644 --- a/linux/drivers/media/video/cx23885/cx23885-core.c +++ b/linux/drivers/media/video/cx23885/cx23885-core.c @@ -648,6 +648,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/linux/drivers/media/video/cx23885/cx23885.h b/linux/drivers/media/video/cx23885/cx23885.h index 891a55e15..2dde9e01a 100644 --- a/linux/drivers/media/video/cx23885/cx23885.h +++ b/linux/drivers/media/video/cx23885/cx23885.h @@ -263,6 +263,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 { |