Commit eca2d34b authored Jul 15, 2016 by Colin Ian King Committed by Mauro Carvalho Chehab Jul 15, 2016

[media] mb86a20s: apply mask to val after checking for read failure

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>

parent 785ef73d

drivers/media/dvb-frontends/mb86a20s.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -301,10 +301,11 @@ static int mb86a20s_read_status(struct dvb_frontend fe, enum fe_status status)

	*status = 0;		*status = 0;

	val = mb86a20s_readreg(state, 0x0a) & 0xf;		val = mb86a20s_readreg(state, 0x0a);
	if (val < 0)		if (val < 0)
	return val;		return val;

			val &= 0xf;
	if (val >= 2)		if (val >= 2)
	*status \|= FE_HAS_SIGNAL;		*status \|= FE_HAS_SIGNAL;