cx23885 changes: to be used against mkrufky/cx24117 branch
Signed-off-by: Luis Alves <lja...@gmail.com>
---
drivers/media/pci/cx23885/cx23885-dvb.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c
b/drivers/media/pci/cx23885/cx23885-dvb.c
index 34120db..0549205 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;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
