diff options
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885-dvb.c')
-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 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) | |||
1058 | case 1: | 1058 | case 1: |
1059 | fe0->dvb.frontend = dvb_attach(cx24117_attach, | 1059 | fe0->dvb.frontend = dvb_attach(cx24117_attach, |
1060 | &tbs_cx24117_config, | 1060 | &tbs_cx24117_config, |
1061 | &i2c_bus->i2c_adap, NULL); | 1061 | &i2c_bus->i2c_adap); |
1062 | break; | 1062 | break; |
1063 | /* PORT C */ | 1063 | /* PORT C */ |
1064 | case 2: | 1064 | case 2: |
1065 | /* use fe1 pointer as temporary holder */ | ||
1066 | /* for the first frontend */ | ||
1067 | fe1 = videobuf_dvb_get_frontend( | ||
1068 | &port->dev->ts1.frontends, 1); | ||
1069 | |||
1070 | fe0->dvb.frontend = dvb_attach(cx24117_attach, | 1065 | fe0->dvb.frontend = dvb_attach(cx24117_attach, |
1071 | &tbs_cx24117_config, | 1066 | &tbs_cx24117_config, |
1072 | &i2c_bus->i2c_adap, fe1->dvb.frontend); | 1067 | &i2c_bus->i2c_adap); |
1073 | /* we're done, so clear fe1 pointer */ | ||
1074 | fe1 = NULL; | ||
1075 | break; | 1068 | break; |
1076 | } | 1069 | } |
1077 | break; | 1070 | break; |