These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / dvb-frontends / rtl2832.c

diff --git a/kernel/drivers/media/dvb-frontends/rtl2832.c b/kernel/drivers/media/dvb-frontends/rtl2832.c
index b400f7b..78b87b2 100644 (file)
--- a/kernel/drivers/media/dvb-frontends/rtl2832.c
+++ b/kernel/drivers/media/dvb-frontends/rtl2832.c
@@ -358,6 +358,10 @@ static int rtl2832_init(struct dvb_frontend *fe)
        dev_dbg(&client->dev, "load settings for tuner=%02x\n",
                dev->pdata->tuner);
        switch (dev->pdata->tuner) {
+       case RTL2832_TUNER_FC2580:
+               len = ARRAY_SIZE(rtl2832_tuner_init_fc2580);
+               init = rtl2832_tuner_init_fc2580;
+               break;
        case RTL2832_TUNER_FC0012:
        case RTL2832_TUNER_FC0013:
                len = ARRAY_SIZE(rtl2832_tuner_init_fc0012);
@@ -376,6 +380,10 @@ static int rtl2832_init(struct dvb_frontend *fe)
                len = ARRAY_SIZE(rtl2832_tuner_init_r820t);
                init = rtl2832_tuner_init_r820t;
                break;
+       case RTL2832_TUNER_SI2157:
+               len = ARRAY_SIZE(rtl2832_tuner_init_si2157);
+               init = rtl2832_tuner_init_si2157;
+               break;
        default:
                ret = -EINVAL;
                goto err;
@@ -680,7 +688,7 @@ err:
        return ret;
 }
 
-static int rtl2832_read_status(struct dvb_frontend *fe, fe_status_t *status)
+static int rtl2832_read_status(struct dvb_frontend *fe, enum fe_status *status)
 {
        struct rtl2832_dev *dev = fe->demodulator_priv;
        struct i2c_client *client = dev->client;
@@ -1311,7 +1319,6 @@ MODULE_DEVICE_TABLE(i2c, rtl2832_id_table);
 
 static struct i2c_driver rtl2832_driver = {
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = "rtl2832",
        },
        .probe          = rtl2832_probe,