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

[kvmfornfv.git] / kernel / drivers / staging / media / mn88472 / mn88472.c

diff --git a/kernel/drivers/staging/media/mn88472/mn88472.c b/kernel/drivers/staging/media/mn88472/mn88472.c
index a4cfcf5..cf2e96b 100644 (file)
--- a/kernel/drivers/staging/media/mn88472/mn88472.c
+++ b/kernel/drivers/staging/media/mn88472/mn88472.c
@@ -218,7 +218,7 @@ err:
        return ret;
 }
 
-static int mn88472_read_status(struct dvb_frontend *fe, fe_status_t *status)
+static int mn88472_read_status(struct dvb_frontend *fe, enum fe_status *status)
 {
        struct i2c_client *client = fe->demodulator_priv;
        struct mn88472_dev *dev = i2c_get_clientdata(client);
@@ -344,12 +344,12 @@ static int mn88472_init(struct dvb_frontend *fe)
        if (ret) {
                dev_err(&client->dev,
                                "parity reg read failed=%d\n", ret);
-               goto err;
+               goto firmware_release;
        }
        if (tmp & 0x10) {
                dev_err(&client->dev,
                                "firmware parity check failed=0x%x\n", tmp);
-               goto err;
+               goto firmware_release;
        }
        dev_err(&client->dev, "firmware parity check succeeded=0x%x\n", tmp);
 
@@ -561,7 +561,6 @@ MODULE_DEVICE_TABLE(i2c, mn88472_id_table);
 
 static struct i2c_driver mn88472_driver = {
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = "mn88472",
        },
        .probe          = mn88472_probe,