From 4856782b9fd9cacfc7667080ccbff19bb53005c8 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Sat, 11 Oct 2008 12:25:25 -0300 Subject: [PATCH] --- yaml --- r: 115627 b: refs/heads/master c: d782ffa24fc6ce01b3308a0bec5aa5d9d666b568 h: refs/heads/master i: 115625: a79fae94d8f61dbc5b4d81f5565ad00d7974d3c0 115623: 5b0a356b85cf721cf0c2dac66cfb85f1e6c56d44 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-core.c | 4 ++++ trunk/drivers/media/video/cx23885/cx23885-dvb.c | 5 ----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b7f75e6179b3..8c2dad96d5b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63248f2664d89cc22cc5a13ec6c76e92f7d5ca39 +refs/heads/master: d782ffa24fc6ce01b3308a0bec5aa5d9d666b568 diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c index beb3e61669a3..7f4b61297175 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-core.c +++ b/trunk/drivers/media/video/cx23885/cx23885-core.c @@ -643,6 +643,10 @@ static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *p port->mpegq.timeout.data = (unsigned long)port; init_timer(&port->mpegq.timeout); + mutex_init(&port->frontends.lock); + INIT_LIST_HEAD(&port->frontends.frontend.felist); + port->frontends.active_fe_id = 0; + switch(portno) { case 1: port->reg_gpcnt = VID_B_GPCNT; diff --git a/trunk/drivers/media/video/cx23885/cx23885-dvb.c b/trunk/drivers/media/video/cx23885/cx23885-dvb.c index 78851526db68..d779b8dd180a 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-dvb.c +++ b/trunk/drivers/media/video/cx23885/cx23885-dvb.c @@ -314,11 +314,6 @@ static int dvb_register(struct cx23885_tsport *port) struct cx23885_i2c *i2c_bus = NULL; struct videobuf_dvb_frontend *fe0; - /* FIXME: add support for multi-frontend */ - mutex_init(&port->frontends.lock); - INIT_LIST_HEAD(&port->frontends.frontend.felist); - port->frontends.active_fe_id = 0; - printk(KERN_INFO "%s() allocating 1 frontend\n", __func__); if (videobuf_dvb_alloc_frontend(dev, &port->frontends, 1) == NULL) {