[PATCH 0/2] stv0910: updates from dddvb 0.9.31

[PATCH 0/2] stv0910: updates from dddvb 0.9.31

[Daniel Scheller]

From: Daniel Scheller <d.scheller@gmx.net>

Digital Devices released dddvb-0.9.31 which carries these two fixes for
the stv0910 demodulator driver.

Should go in after the seven stv0910/stv6111 cleanup patches (see [1]),
namely after [2]. They might apply cleanly without them, but they may
also hard-depend and conflict without them (I honestly did not test
this as I applied them ontop of my "carry everything" branch).

[1] http://www.spinics.net/lists/linux-media/msg119065.html
[2] https://patchwork.linuxtv.org/patch/42728/

Daniel Scheller (2):
  [media] dvb-frontends/stv0910: fix FE_HAS_LOCK check order in tune()
  [media] dvb-frontends/stv0910: fix mask for scramblingcode setup

 drivers/media/dvb-frontends/stv0910.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

-- 
2.13.0

[PATCH 1/2] [media] dvb-frontends/stv0910: fix FE_HAS_LOCK check order in tune()

[Daniel Scheller]

From: Daniel Scheller <d.scheller@gmx.net>

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
---
 drivers/media/dvb-frontends/stv0910.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/media/dvb-frontends/stv0910.c b/drivers/media/dvb-frontends/stv0910.c
index a2648dd91a57..fe25b1778555 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;
 }
 
-- 
2.13.0

[PATCH 2/2] [media] dvb-frontends/stv0910: fix mask for scramblingcode setup

[Daniel Scheller]

From: Daniel Scheller <d.scheller@gmx.net>

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
---
 drivers/media/dvb-frontends/stv0910.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/dvb-frontends/stv0910.c b/drivers/media/dvb-frontends/stv0910.c
index fe25b1778555..d1ae9553f74c 100644
--- a/drivers/media/dvb-frontends/stv0910.c
+++ b/drivers/media/dvb-frontends/stv0910.c
@@ -1021,7 +1021,7 @@ static int start(struct stv *state, struct dtv_frontend_properties *p)
 		write_reg(state, RSTV0910_P2_PLROOT1 + state->regoff,
 			  (scrambling_code >> 8) & 0xff);
 		write_reg(state, RSTV0910_P2_PLROOT2 + state->regoff,
-			  (scrambling_code >> 16) & 0x07);
+			  (scrambling_code >> 16) & 0x0f);
 		state->cur_scrambling_code = scrambling_code;
 	}
 
-- 
2.13.0