diff options
| author | Antti Palosaari <crope@iki.fi> | 2012-01-21 18:28:38 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-02-28 16:43:12 -0500 |
| commit | fba16b133e6b8dd3dd3f6f34beca1889c9ac731f (patch) | |
| tree | 5cb62e4996bfc52a43de7e7421925edabcffbfbd /drivers/media/dvb | |
| parent | 0485a7089b8d6c11fe2db1123a1ed39a2676592f (diff) | |
[media] rtl28xxu: make it compile against current Kernel
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/rtl28xxu.c | 73 |
1 files changed, 42 insertions, 31 deletions
diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.c b/drivers/media/dvb/dvb-usb/rtl28xxu.c index a6b5c04b3a3b..101d98e5dcdb 100644 --- a/drivers/media/dvb/dvb-usb/rtl28xxu.c +++ b/drivers/media/dvb/dvb-usb/rtl28xxu.c | |||
| @@ -367,9 +367,9 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap) | |||
| 367 | 367 | ||
| 368 | found: | 368 | found: |
| 369 | /* attach demodulator */ | 369 | /* attach demodulator */ |
| 370 | adap->fe[0] = dvb_attach(rtl2830_attach, rtl2830_config, | 370 | adap->fe_adap[0].fe = dvb_attach(rtl2830_attach, rtl2830_config, |
| 371 | &adap->dev->i2c_adap); | 371 | &adap->dev->i2c_adap); |
| 372 | if (adap->fe[0] == NULL) { | 372 | if (adap->fe_adap[0].fe == NULL) { |
| 373 | ret = -ENODEV; | 373 | ret = -ENODEV; |
| 374 | goto err; | 374 | goto err; |
| 375 | } | 375 | } |
| @@ -489,20 +489,21 @@ static int rtl2831u_tuner_attach(struct dvb_usb_adapter *adap) | |||
| 489 | deb_info("%s:\n", __func__); | 489 | deb_info("%s:\n", __func__); |
| 490 | 490 | ||
| 491 | /* use rtl2830 driver I2C adapter, for more info see rtl2830 driver */ | 491 | /* use rtl2830 driver I2C adapter, for more info see rtl2830 driver */ |
| 492 | rtl2830_tuner_i2c = rtl2830_get_tuner_i2c_adapter(adap->fe[0]); | 492 | rtl2830_tuner_i2c = rtl2830_get_tuner_i2c_adapter(adap->fe_adap[0].fe); |
| 493 | 493 | ||
| 494 | switch (priv->tuner) { | 494 | switch (priv->tuner) { |
| 495 | case TUNER_RTL2830_QT1010: | 495 | case TUNER_RTL2830_QT1010: |
| 496 | fe = dvb_attach(qt1010_attach, adap->fe[0], rtl2830_tuner_i2c, | 496 | fe = dvb_attach(qt1010_attach, adap->fe_adap[0].fe, |
| 497 | &rtl28xxu_qt1010_config); | 497 | rtl2830_tuner_i2c, &rtl28xxu_qt1010_config); |
| 498 | break; | 498 | break; |
| 499 | case TUNER_RTL2830_MT2060: | 499 | case TUNER_RTL2830_MT2060: |
| 500 | fe = dvb_attach(mt2060_attach, adap->fe[0], rtl2830_tuner_i2c, | 500 | fe = dvb_attach(mt2060_attach, adap->fe_adap[0].fe, |
| 501 | &rtl28xxu_mt2060_config, 1220); | 501 | rtl2830_tuner_i2c, &rtl28xxu_mt2060_config, |
| 502 | 1220); | ||
| 502 | break; | 503 | break; |
| 503 | case TUNER_RTL2830_MXL5005S: | 504 | case TUNER_RTL2830_MXL5005S: |
| 504 | fe = dvb_attach(mxl5005s_attach, adap->fe[0], rtl2830_tuner_i2c, | 505 | fe = dvb_attach(mxl5005s_attach, adap->fe_adap[0].fe, |
| 505 | &rtl28xxu_mxl5005s_config); | 506 | rtl2830_tuner_i2c, &rtl28xxu_mxl5005s_config); |
| 506 | break; | 507 | break; |
| 507 | default: | 508 | default: |
| 508 | err("unknown tuner=%d", priv->tuner); | 509 | err("unknown tuner=%d", priv->tuner); |
| @@ -814,19 +815,24 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { | |||
| 814 | .num_adapters = 1, | 815 | .num_adapters = 1, |
| 815 | .adapter = { | 816 | .adapter = { |
| 816 | { | 817 | { |
| 817 | .frontend_attach = rtl2831u_frontend_attach, | 818 | .num_frontends = 1, |
| 818 | .tuner_attach = rtl2831u_tuner_attach, | 819 | .fe = { |
| 819 | .streaming_ctrl = rtl28xxu_streaming_ctrl, | 820 | { |
| 820 | .stream = { | 821 | .frontend_attach = rtl2831u_frontend_attach, |
| 821 | .type = USB_BULK, | 822 | .tuner_attach = rtl2831u_tuner_attach, |
| 822 | .count = 6, | 823 | .streaming_ctrl = rtl28xxu_streaming_ctrl, |
| 823 | .endpoint = 0x81, | 824 | .stream = { |
| 824 | .u = { | 825 | .type = USB_BULK, |
| 825 | .bulk = { | 826 | .count = 6, |
| 826 | .buffersize = 4096, | 827 | .endpoint = 0x81, |
| 828 | .u = { | ||
| 829 | .bulk = { | ||
| 830 | .buffersize = 4096, | ||
| 831 | } | ||
| 832 | } | ||
| 827 | } | 833 | } |
| 828 | } | 834 | } |
| 829 | }, | 835 | } |
| 830 | } | 836 | } |
| 831 | }, | 837 | }, |
| 832 | 838 | ||
| @@ -870,19 +876,24 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { | |||
| 870 | .num_adapters = 1, | 876 | .num_adapters = 1, |
| 871 | .adapter = { | 877 | .adapter = { |
| 872 | { | 878 | { |
| 873 | .frontend_attach = rtl2832u_frontend_attach, | 879 | .num_frontends = 1, |
| 874 | .tuner_attach = rtl2832u_tuner_attach, | 880 | .fe = { |
| 875 | .streaming_ctrl = rtl28xxu_streaming_ctrl, | 881 | { |
| 876 | .stream = { | 882 | .frontend_attach = rtl2832u_frontend_attach, |
| 877 | .type = USB_BULK, | 883 | .tuner_attach = rtl2832u_tuner_attach, |
| 878 | .count = 6, | 884 | .streaming_ctrl = rtl28xxu_streaming_ctrl, |
| 879 | .endpoint = 0x81, | 885 | .stream = { |
| 880 | .u = { | 886 | .type = USB_BULK, |
| 881 | .bulk = { | 887 | .count = 6, |
| 882 | .buffersize = 4096, | 888 | .endpoint = 0x81, |
| 889 | .u = { | ||
| 890 | .bulk = { | ||
| 891 | .buffersize = 4096, | ||
| 892 | } | ||
| 893 | } | ||
| 883 | } | 894 | } |
| 884 | } | 895 | } |
| 885 | }, | 896 | } |
| 886 | } | 897 | } |
| 887 | }, | 898 | }, |
| 888 | 899 | ||