[media] mb86a20s: apply mask to val after checking for read failure
authorColin Ian King <colin.king@canonical.com>
Fri, 15 Jul 2016 15:59:15 +0000 (12:59 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 15 Jul 2016 16:32:58 +0000 (13:32 -0300)
Appling the mask 0x0f to the immediate return of the call to
mb86a20s_readreg will always result in a positive value, meaning that the
check of ret < 0 will never work.  Instead, check for a -ve return value
first, and then mask val with 0x0f.

Kudos to Mauro Carvalho Chehab for spotting the mistake in my original fix.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/dvb-frontends/mb86a20s.c

index fb88dddaf3a3476e51ab2771cf90c02880f8bb96..41325328a22ed2f9581eb0b79fcbf1c10932a6c1 100644 (file)
@@ -301,10 +301,11 @@ static int mb86a20s_read_status(struct dvb_frontend *fe, enum fe_status *status)
 
        *status = 0;
 
-       val = mb86a20s_readreg(state, 0x0a) & 0xf;
+       val = mb86a20s_readreg(state, 0x0a);
        if (val < 0)
                return val;
 
+       val &= 0xf;
        if (val >= 2)
                *status |= FE_HAS_SIGNAL;