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

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

diff --git a/kernel/drivers/media/dvb-frontends/bcm3510.c b/kernel/drivers/media/dvb-frontends/bcm3510.c
index 638c7aa..d30275f 100644 (file)
--- a/kernel/drivers/media/dvb-frontends/bcm3510.c
+++ b/kernel/drivers/media/dvb-frontends/bcm3510.c
@@ -289,7 +289,7 @@ static int bcm3510_refresh_state(struct bcm3510_state *st)
        return 0;
 }
 
-static int bcm3510_read_status(struct dvb_frontend *fe, fe_status_t *status)
+static int bcm3510_read_status(struct dvb_frontend *fe, enum fe_status *status)
 {
        struct bcm3510_state* st = fe->demodulator_priv;
        bcm3510_refresh_state(st);
@@ -685,7 +685,7 @@ static int bcm3510_reset(struct bcm3510_state *st)
        if ((ret = bcm3510_writeB(st,0xa0,v)) < 0)
                return ret;
 
-    t = jiffies + 3*HZ;
+       t = jiffies + 3*HZ;
        while (time_before(jiffies, t)) {
                msleep(10);
                if ((ret = bcm3510_readB(st,0xa2,&v)) < 0)
@@ -708,7 +708,7 @@ static int bcm3510_clear_reset(struct bcm3510_state *st)
        if ((ret = bcm3510_writeB(st,0xa0,v)) < 0)
                return ret;
 
-    t = jiffies + 3*HZ;
+       t = jiffies + 3*HZ;
        while (time_before(jiffies, t)) {
                msleep(10);
                if ((ret = bcm3510_readB(st,0xa2,&v)) < 0)