Commit fba16b13 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab

[media] rtl28xxu: make it compile against current Kernel

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0485a708
...@@ -367,9 +367,9 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -367,9 +367,9 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap)
found: found:
/* attach demodulator */ /* attach demodulator */
adap->fe[0] = dvb_attach(rtl2830_attach, rtl2830_config, adap->fe_adap[0].fe = dvb_attach(rtl2830_attach, rtl2830_config,
&adap->dev->i2c_adap); &adap->dev->i2c_adap);
if (adap->fe[0] == NULL) { if (adap->fe_adap[0].fe == NULL) {
ret = -ENODEV; ret = -ENODEV;
goto err; goto err;
} }
...@@ -489,20 +489,21 @@ static int rtl2831u_tuner_attach(struct dvb_usb_adapter *adap) ...@@ -489,20 +489,21 @@ static int rtl2831u_tuner_attach(struct dvb_usb_adapter *adap)
deb_info("%s:\n", __func__); deb_info("%s:\n", __func__);
/* use rtl2830 driver I2C adapter, for more info see rtl2830 driver */ /* use rtl2830 driver I2C adapter, for more info see rtl2830 driver */
rtl2830_tuner_i2c = rtl2830_get_tuner_i2c_adapter(adap->fe[0]); rtl2830_tuner_i2c = rtl2830_get_tuner_i2c_adapter(adap->fe_adap[0].fe);
switch (priv->tuner) { switch (priv->tuner) {
case TUNER_RTL2830_QT1010: case TUNER_RTL2830_QT1010:
fe = dvb_attach(qt1010_attach, adap->fe[0], rtl2830_tuner_i2c, fe = dvb_attach(qt1010_attach, adap->fe_adap[0].fe,
&rtl28xxu_qt1010_config); rtl2830_tuner_i2c, &rtl28xxu_qt1010_config);
break; break;
case TUNER_RTL2830_MT2060: case TUNER_RTL2830_MT2060:
fe = dvb_attach(mt2060_attach, adap->fe[0], rtl2830_tuner_i2c, fe = dvb_attach(mt2060_attach, adap->fe_adap[0].fe,
&rtl28xxu_mt2060_config, 1220); rtl2830_tuner_i2c, &rtl28xxu_mt2060_config,
1220);
break; break;
case TUNER_RTL2830_MXL5005S: case TUNER_RTL2830_MXL5005S:
fe = dvb_attach(mxl5005s_attach, adap->fe[0], rtl2830_tuner_i2c, fe = dvb_attach(mxl5005s_attach, adap->fe_adap[0].fe,
&rtl28xxu_mxl5005s_config); rtl2830_tuner_i2c, &rtl28xxu_mxl5005s_config);
break; break;
default: default:
err("unknown tuner=%d", priv->tuner); err("unknown tuner=%d", priv->tuner);
...@@ -814,19 +815,24 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { ...@@ -814,19 +815,24 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = {
.num_adapters = 1, .num_adapters = 1,
.adapter = { .adapter = {
{ {
.frontend_attach = rtl2831u_frontend_attach, .num_frontends = 1,
.tuner_attach = rtl2831u_tuner_attach, .fe = {
.streaming_ctrl = rtl28xxu_streaming_ctrl, {
.stream = { .frontend_attach = rtl2831u_frontend_attach,
.type = USB_BULK, .tuner_attach = rtl2831u_tuner_attach,
.count = 6, .streaming_ctrl = rtl28xxu_streaming_ctrl,
.endpoint = 0x81, .stream = {
.u = { .type = USB_BULK,
.bulk = { .count = 6,
.buffersize = 4096, .endpoint = 0x81,
.u = {
.bulk = {
.buffersize = 4096,
}
}
} }
} }
}, }
} }
}, },
...@@ -870,19 +876,24 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { ...@@ -870,19 +876,24 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = {
.num_adapters = 1, .num_adapters = 1,
.adapter = { .adapter = {
{ {
.frontend_attach = rtl2832u_frontend_attach, .num_frontends = 1,
.tuner_attach = rtl2832u_tuner_attach, .fe = {
.streaming_ctrl = rtl28xxu_streaming_ctrl, {
.stream = { .frontend_attach = rtl2832u_frontend_attach,
.type = USB_BULK, .tuner_attach = rtl2832u_tuner_attach,
.count = 6, .streaming_ctrl = rtl28xxu_streaming_ctrl,
.endpoint = 0x81, .stream = {
.u = { .type = USB_BULK,
.bulk = { .count = 6,
.buffersize = 4096, .endpoint = 0x81,
.u = {
.bulk = {
.buffersize = 4096,
}
}
} }
} }
}, }
} }
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment