aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/ce6230.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/dvb-usb/ce6230.c')
-rw-r--r--drivers/media/dvb/dvb-usb/ce6230.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/ce6230.c b/drivers/media/dvb/dvb-usb/ce6230.c
index 6d1a3041540d..57afb5a9157e 100644
--- a/drivers/media/dvb/dvb-usb/ce6230.c
+++ b/drivers/media/dvb/dvb-usb/ce6230.c
@@ -186,9 +186,9 @@ static struct zl10353_config ce6230_zl10353_config = {
186static int ce6230_zl10353_frontend_attach(struct dvb_usb_adapter *adap) 186static int ce6230_zl10353_frontend_attach(struct dvb_usb_adapter *adap)
187{ 187{
188 deb_info("%s:\n", __func__); 188 deb_info("%s:\n", __func__);
189 adap->fe = dvb_attach(zl10353_attach, &ce6230_zl10353_config, 189 adap->fe_adap[0].fe = dvb_attach(zl10353_attach, &ce6230_zl10353_config,
190 &adap->dev->i2c_adap); 190 &adap->dev->i2c_adap);
191 if (adap->fe == NULL) 191 if (adap->fe_adap[0].fe == NULL)
192 return -ENODEV; 192 return -ENODEV;
193 return 0; 193 return 0;
194} 194}
@@ -214,7 +214,7 @@ static int ce6230_mxl5003s_tuner_attach(struct dvb_usb_adapter *adap)
214{ 214{
215 int ret; 215 int ret;
216 deb_info("%s:\n", __func__); 216 deb_info("%s:\n", __func__);
217 ret = dvb_attach(mxl5005s_attach, adap->fe, &adap->dev->i2c_adap, 217 ret = dvb_attach(mxl5005s_attach, adap->fe_adap[0].fe, &adap->dev->i2c_adap,
218 &ce6230_mxl5003s_config) == NULL ? -ENODEV : 0; 218 &ce6230_mxl5003s_config) == NULL ? -ENODEV : 0;
219 return ret; 219 return ret;
220} 220}
@@ -273,6 +273,8 @@ static struct dvb_usb_device_properties ce6230_properties = {
273 .num_adapters = 1, 273 .num_adapters = 1,
274 .adapter = { 274 .adapter = {
275 { 275 {
276 .num_frontends = 1,
277 .fe = {{
276 .frontend_attach = ce6230_zl10353_frontend_attach, 278 .frontend_attach = ce6230_zl10353_frontend_attach,
277 .tuner_attach = ce6230_mxl5003s_tuner_attach, 279 .tuner_attach = ce6230_mxl5003s_tuner_attach,
278 .stream = { 280 .stream = {
@@ -285,6 +287,7 @@ static struct dvb_usb_device_properties ce6230_properties = {
285 } 287 }
286 } 288 }
287 }, 289 },
290 }},
288 } 291 }
289 }, 292 },
290 293