summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-02-26 03:26:41 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-02-28 19:20:15 +0100
commitc6aa852ae0c265da2f7dd84f5d864d55415e37c9 (patch)
tree1fc4725496cbe0595f6c26af1db1ac9cd7b84a72
parent[media] m88rs2000: prevent frontend crash on continuous transponder scans (diff)
downloadlinux-c6aa852ae0c265da2f7dd84f5d864d55415e37c9.tar.xz
linux-c6aa852ae0c265da2f7dd84f5d864d55415e37c9.zip
[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>
-rw-r--r--drivers/media/dvb-frontends/stv0900_sw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/stv0900_sw.c b/drivers/media/dvb-frontends/stv0900_sw.c
index 0a40edfad739..4ce1d260b3eb 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;