diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dtv5100.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dtv5100.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/dtv5100.c b/drivers/media/dvb/dvb-usb/dtv5100.c index 75ed55cdd8a0..7373132163d2 100644 --- a/drivers/media/dvb/dvb-usb/dtv5100.c +++ b/drivers/media/dvb/dvb-usb/dtv5100.c | |||
@@ -115,13 +115,13 @@ static struct zl10353_config dtv5100_zl10353_config = { | |||
115 | 115 | ||
116 | static int dtv5100_frontend_attach(struct dvb_usb_adapter *adap) | 116 | static int dtv5100_frontend_attach(struct dvb_usb_adapter *adap) |
117 | { | 117 | { |
118 | adap->fe[0] = dvb_attach(zl10353_attach, &dtv5100_zl10353_config, | 118 | adap->fe_adap[0].fe = dvb_attach(zl10353_attach, &dtv5100_zl10353_config, |
119 | &adap->dev->i2c_adap); | 119 | &adap->dev->i2c_adap); |
120 | if (adap->fe[0] == NULL) | 120 | if (adap->fe_adap[0].fe == NULL) |
121 | return -EIO; | 121 | return -EIO; |
122 | 122 | ||
123 | /* disable i2c gate, or it won't work... is this safe? */ | 123 | /* disable i2c gate, or it won't work... is this safe? */ |
124 | adap->fe[0]->ops.i2c_gate_ctrl = NULL; | 124 | adap->fe_adap[0].fe->ops.i2c_gate_ctrl = NULL; |
125 | 125 | ||
126 | return 0; | 126 | return 0; |
127 | } | 127 | } |
@@ -133,7 +133,7 @@ static struct qt1010_config dtv5100_qt1010_config = { | |||
133 | static int dtv5100_tuner_attach(struct dvb_usb_adapter *adap) | 133 | static int dtv5100_tuner_attach(struct dvb_usb_adapter *adap) |
134 | { | 134 | { |
135 | return dvb_attach(qt1010_attach, | 135 | return dvb_attach(qt1010_attach, |
136 | adap->fe[0], &adap->dev->i2c_adap, | 136 | adap->fe_adap[0].fe, &adap->dev->i2c_adap, |
137 | &dtv5100_qt1010_config) == NULL ? -ENODEV : 0; | 137 | &dtv5100_qt1010_config) == NULL ? -ENODEV : 0; |
138 | } | 138 | } |
139 | 139 | ||
@@ -180,6 +180,8 @@ static struct dvb_usb_device_properties dtv5100_properties = { | |||
180 | 180 | ||
181 | .num_adapters = 1, | 181 | .num_adapters = 1, |
182 | .adapter = {{ | 182 | .adapter = {{ |
183 | .num_frontends = 1, | ||
184 | .fe = {{ | ||
183 | .frontend_attach = dtv5100_frontend_attach, | 185 | .frontend_attach = dtv5100_frontend_attach, |
184 | .tuner_attach = dtv5100_tuner_attach, | 186 | .tuner_attach = dtv5100_tuner_attach, |
185 | 187 | ||
@@ -193,6 +195,7 @@ static struct dvb_usb_device_properties dtv5100_properties = { | |||
193 | } | 195 | } |
194 | } | 196 | } |
195 | }, | 197 | }, |
198 | }}, | ||
196 | } }, | 199 | } }, |
197 | 200 | ||
198 | .i2c_algo = &dtv5100_i2c_algo, | 201 | .i2c_algo = &dtv5100_i2c_algo, |