From: Daniel Scheller <d.scheller@gmx.net>
Date: Sun, 25 Jun 2017 11:26:46 +0000 (-0300)
Subject: media: dvb-frontends/stv0367: update UCB readout condition logic
X-Git-Tag: v4.13-rc4~5^2~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87b467107438423b4dcbcece7ec1bced57992b25;p=thirdparty%2Fkernel%2Flinux.git

media: dvb-frontends/stv0367: update UCB readout condition logic

Since the other statistics are read when fe_status conditions are TRUE,
change the ucblocks readout logic to match this aswell.

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---

diff --git a/drivers/media/dvb-frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c
index e7bed20e80f6b..1983c87d7d22c 100644
--- a/drivers/media/dvb-frontends/stv0367.c
+++ b/drivers/media/dvb-frontends/stv0367.c
@@ -3081,13 +3081,11 @@ static int stv0367ddb_read_status(struct dvb_frontend *fe,
 	else
 		p->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
 
-	/* stop if demod isn't locked */
-	if (!(*status & FE_HAS_LOCK)) {
+	/* read uncorrected blocks on FE_HAS_LOCK */
+	if (*status & FE_HAS_LOCK)
+		stv0367ddb_read_ucblocks(fe);
+	else
 		p->block_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
-		return ret;
-	}
-
-	stv0367ddb_read_ucblocks(fe);
 
 	return 0;
 }