aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/gl861.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/dvb-usb/gl861.c')
-rw-r--r--drivers/media/dvb/dvb-usb/gl861.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
index fba24ed2e843..63681df244c4 100644
--- a/drivers/media/dvb/dvb-usb/gl861.c
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -103,9 +103,9 @@ static struct zl10353_config gl861_zl10353_config = {
103static int gl861_frontend_attach(struct dvb_usb_adapter *adap) 103static int gl861_frontend_attach(struct dvb_usb_adapter *adap)
104{ 104{
105 105
106 adap->fe[0] = dvb_attach(zl10353_attach, &gl861_zl10353_config, 106 adap->fe_adap[0].fe = dvb_attach(zl10353_attach, &gl861_zl10353_config,
107 &adap->dev->i2c_adap); 107 &adap->dev->i2c_adap);
108 if (adap->fe[0] == NULL) 108 if (adap->fe_adap[0].fe == NULL)
109 return -EIO; 109 return -EIO;
110 110
111 return 0; 111 return 0;
@@ -118,7 +118,7 @@ static struct qt1010_config gl861_qt1010_config = {
118static int gl861_tuner_attach(struct dvb_usb_adapter *adap) 118static int gl861_tuner_attach(struct dvb_usb_adapter *adap)
119{ 119{
120 return dvb_attach(qt1010_attach, 120 return dvb_attach(qt1010_attach,
121 adap->fe[0], &adap->dev->i2c_adap, 121 adap->fe_adap[0].fe, &adap->dev->i2c_adap,
122 &gl861_qt1010_config) == NULL ? -ENODEV : 0; 122 &gl861_qt1010_config) == NULL ? -ENODEV : 0;
123} 123}
124 124
@@ -167,6 +167,8 @@ static struct dvb_usb_device_properties gl861_properties = {
167 167
168 .num_adapters = 1, 168 .num_adapters = 1,
169 .adapter = {{ 169 .adapter = {{
170 .num_frontends = 1,
171 .fe = {{
170 172
171 .frontend_attach = gl861_frontend_attach, 173 .frontend_attach = gl861_frontend_attach,
172 .tuner_attach = gl861_tuner_attach, 174 .tuner_attach = gl861_tuner_attach,
@@ -181,6 +183,7 @@ static struct dvb_usb_device_properties gl861_properties = {
181 } 183 }
182 } 184 }
183 }, 185 },
186 }},
184 } }, 187 } },
185 .i2c_algo = &gl861_i2c_algo, 188 .i2c_algo = &gl861_i2c_algo,
186 189