summaryrefslogtreecommitdiff
path: root/drivers/media/pci/cx23885
diff options
context:
space:
mode:
authorLuis Alves <ljalvs@gmail.com>2013-10-03 15:33:47 +0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-03 14:40:12 +0400
commitd10e8280c4c2513d3e7350c27d8e6f0fa03a5f71 (patch)
tree71416e674be5b5c3490fc77885effd07f8dc776c /drivers/media/pci/cx23885
parente6001482d49ffe1554f55c47a4ed903e86fe69a5 (diff)
downloadlinux-d10e8280c4c2513d3e7350c27d8e6f0fa03a5f71.tar.xz
[media] cx24117: use hybrid_tuner_request/release_state to share state between multiple instances
...and remove the frontend pointer param from cx24117_attach() Signed-off-by: Luis Alves <ljalvs@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/cx23885')
-rw-r--r--drivers/media/pci/cx23885/cx23885-dvb.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 34120db1f51f..05492053b473 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -1058,20 +1058,13 @@ static int dvb_register(struct cx23885_tsport *port)
case 1:
fe0->dvb.frontend = dvb_attach(cx24117_attach,
&tbs_cx24117_config,
- &i2c_bus->i2c_adap, NULL);
+ &i2c_bus->i2c_adap);
break;
/* PORT C */
case 2:
- /* use fe1 pointer as temporary holder */
- /* for the first frontend */
- fe1 = videobuf_dvb_get_frontend(
- &port->dev->ts1.frontends, 1);
-
fe0->dvb.frontend = dvb_attach(cx24117_attach,
&tbs_cx24117_config,
- &i2c_bus->i2c_adap, fe1->dvb.frontend);
- /* we're done, so clear fe1 pointer */
- fe1 = NULL;
+ &i2c_bus->i2c_adap);
break;
}
break;