summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-frontends
diff options
context:
space:
mode:
authorDaniel Scheller2017-08-20 12:29:14 +0200
committerMauro Carvalho Chehab2017-08-20 13:29:10 +0200
commitf0e72c29fd063aca325afee25a6f9bcc22871837 (patch)
treeb940db6e2dcb7096ea9557c1f80e1c74058f74dd /drivers/media/dvb-frontends
parentmedia: MAINTAINERS: add entry for mxl5xx (diff)
downloadkernel-qcow2-linux-f0e72c29fd063aca325afee25a6f9bcc22871837.tar.gz
kernel-qcow2-linux-f0e72c29fd063aca325afee25a6f9bcc22871837.tar.xz
kernel-qcow2-linux-f0e72c29fd063aca325afee25a6f9bcc22871837.zip
media: dvb-frontends/stv0910: fix FE_HAS_LOCK check order in tune()
It should first read the status and then check if FE has lock. Signed-off-by: Daniel Scheller <d.scheller@gmx.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/dvb-frontends')
-rw-r--r--drivers/media/dvb-frontends/stv0910.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/dvb-frontends/stv0910.c b/drivers/media/dvb-frontends/stv0910.c
index 45d94c3a29f2..e87a3ee6155c 100644
--- a/drivers/media/dvb-frontends/stv0910.c
+++ b/drivers/media/dvb-frontends/stv0910.c
@@ -1581,13 +1581,15 @@ static int tune(struct dvb_frontend *fe, bool re_tune,
return r;
state->tune_time = jiffies;
}
- if (*status & FE_HAS_LOCK)
- return 0;
- *delay = HZ;
r = read_status(fe, status);
if (r)
return r;
+
+ if (*status & FE_HAS_LOCK)
+ return 0;
+ *delay = HZ;
+
return 0;
}