Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/media/dvb/dvb-usb/rtl28xxu.c

+42 −31
Original line number Diff line number Diff line
@@ -367,9 +367,9 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap) 


found:

	/* 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);

	if (adap->fe[0] == NULL) {

	if (adap->fe_adap[0].fe == NULL) {

		ret = -ENODEV;

		goto err;

	}
@@ -489,20 +489,21 @@ static int rtl2831u_tuner_attach(struct dvb_usb_adapter *adap) 
	deb_info("%s:\n", __func__);



	/* 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) {

	case TUNER_RTL2830_QT1010:

		fe = dvb_attach(qt1010_attach, adap->fe[0], rtl2830_tuner_i2c,

			&rtl28xxu_qt1010_config);

		fe = dvb_attach(qt1010_attach, adap->fe_adap[0].fe,

				rtl2830_tuner_i2c, &rtl28xxu_qt1010_config);

		break;

	case TUNER_RTL2830_MT2060:

		fe = dvb_attach(mt2060_attach, adap->fe[0], rtl2830_tuner_i2c,

			&rtl28xxu_mt2060_config, 1220);

		fe = dvb_attach(mt2060_attach, adap->fe_adap[0].fe,

				rtl2830_tuner_i2c, &rtl28xxu_mt2060_config,

				1220);

		break;

	case TUNER_RTL2830_MXL5005S:

		fe = dvb_attach(mxl5005s_attach, adap->fe[0], rtl2830_tuner_i2c,

			&rtl28xxu_mxl5005s_config);

		fe = dvb_attach(mxl5005s_attach, adap->fe_adap[0].fe,

			rtl2830_tuner_i2c, &rtl28xxu_mxl5005s_config);

		break;

	default:

		err("unknown tuner=%d", priv->tuner);
@@ -813,6 +814,9 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { 


		.num_adapters = 1,

		.adapter = {

			{

				.num_frontends = 1,

				.fe = {

					{

						.frontend_attach = rtl2831u_frontend_attach,

						.tuner_attach    = rtl2831u_tuner_attach,
@@ -826,7 +830,9 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { 
									.buffersize = 4096,

								}

							}

				},

						}

					}

				}

			}

		},
@@ -869,6 +875,9 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { 


		.num_adapters = 1,

		.adapter = {

			{

				.num_frontends = 1,

				.fe = {

					{

						.frontend_attach = rtl2832u_frontend_attach,

						.tuner_attach    = rtl2832u_tuner_attach,
@@ -882,7 +891,9 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { 
									.buffersize = 4096,

								}

							}

				},

						}

					}

				}

			}

		},