From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 26 Feb 2014 02:26:41 +0000 (-0300)
Subject: upstream: [media] stv0900: remove an unneeded check
X-Git-Tag: submit/tizen/20141121.110247~1424
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48468f43c5dcd35fdf36d91118ca58812a977251;p=platform%2Fkernel%2Flinux-3.10.git

upstream: [media] stv0900: remove an unneeded check

No need to check lock twice here.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/dvb-frontends/stv0900_sw.c b/drivers/media/dvb-frontends/stv0900_sw.c
index 0a40edf..4ce1d26 100644
--- a/drivers/media/dvb-frontends/stv0900_sw.c
+++ b/drivers/media/dvb-frontends/stv0900_sw.c
@@ -1081,7 +1081,7 @@ static int stv0900_wait_for_lock(struct stv0900_internal *intp,
 	lock = stv0900_get_demod_lock(intp, demod, dmd_timeout);
 
 	if (lock)
-		lock = lock && stv0900_get_fec_lock(intp, demod, fec_timeout);
+		lock = stv0900_get_fec_lock(intp, demod, fec_timeout);
 
 	if (lock) {
 		lock = 0;