diff options
| author | Luis Alves <ljalvs@gmail.com> | 2013-10-03 08:33:47 -0300 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-08-08 15:21:22 +0900 |
| commit | bbf7ee2d312bd755a0c480d291ca02d435c65370 (patch) | |
| tree | f913675bd12cd9d9d89fa338a2fc11f6fb0d2fdc /drivers/media/pci | |
| parent | fbd011484754790022d6023fa119aee61315ddc3 (diff) | |
| download | linux-3.10-bbf7ee2d312bd755a0c480d291ca02d435c65370.tar.gz linux-3.10-bbf7ee2d312bd755a0c480d291ca02d435c65370.tar.bz2 linux-3.10-bbf7ee2d312bd755a0c480d291ca02d435c65370.zip | |
upstream: [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')
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885-dvb.c | 11 |
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 4de3dbb5b43..1ef518a4280 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -1047,20 +1047,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; |