[1/2] stb0899: set FE_HAS_SIGNAL flag in read_status

Message ID 4F4D1FA8.1090100@gmx.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Andreas Regel Feb. 28, 2012, 6:40 p.m. UTC
  In stb0899_read_status the FE_HAS_SIGNAL flag was not set in case of a
successful carrier lock. This change fixes that.

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
---
  drivers/media/dvb/frontends/stb0899_drv.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)

  				if (STB0899_GETFIELD(VITCURPUN, reg)) {
@@ -1088,7 +1088,7 @@ static int stb0899_read_status(struct dvb_frontend 
*fe, enum fe_status *status)
  		if (internal->lock) {
  			reg = STB0899_READ_S2REG(STB0899_S2DEMOD, DMD_STAT2);
  			if (STB0899_GETFIELD(UWP_LOCK, reg) && STB0899_GETFIELD(CSM_LOCK, 
reg)) {
-				*status |= FE_HAS_CARRIER;
+				*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
  				dprintk(state->verbose, FE_DEBUG, 1,
  					"UWP & CSM Lock ! ---> DVB-S2 FE_HAS_CARRIER");
  -- 1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

Comments

Klaus Schmidinger Feb. 29, 2012, 8:25 a.m. UTC | #1
On 28.02.2012 19:40, Andreas Regel wrote:
> In stb0899_read_status the FE_HAS_SIGNAL flag was not set in case of a
> successful carrier lock. This change fixes that.
>
> Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
> ---
>  drivers/media/dvb/frontends/stb0899_drv.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c
> index 38565be..4a58afc 100644
> --- a/drivers/media/dvb/frontends/stb0899_drv.c
> +++ b/drivers/media/dvb/frontends/stb0899_drv.c
> @@ -1071,7 +1071,7 @@ static int stb0899_read_status(struct dvb_frontend *fe, enum fe_status *status)
>              reg  = stb0899_read_reg(state, STB0899_VSTATUS);
>              if (STB0899_GETFIELD(VSTATUS_LOCKEDVIT, reg)) {
>                  dprintk(state->verbose, FE_DEBUG, 1, "--------> FE_HAS_CARRIER | FE_HAS_LOCK");
> -                *status |= FE_HAS_CARRIER | FE_HAS_LOCK;
> +                *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_LOCK;
>                   reg = stb0899_read_reg(state, STB0899_PLPARM);
>                  if (STB0899_GETFIELD(VITCURPUN, reg)) {
> @@ -1088,7 +1088,7 @@ static int stb0899_read_status(struct dvb_frontend *fe, enum fe_status *status)
>          if (internal->lock) {
>              reg = STB0899_READ_S2REG(STB0899_S2DEMOD, DMD_STAT2);
>              if (STB0899_GETFIELD(UWP_LOCK, reg) && STB0899_GETFIELD(CSM_LOCK, reg)) {
> -                *status |= FE_HAS_CARRIER;
> +                *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
>                  dprintk(state->verbose, FE_DEBUG, 1,
>                      "UWP & CSM Lock ! ---> DVB-S2 FE_HAS_CARRIER");

Acked-by: Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

Patch

diff --git a/drivers/media/dvb/frontends/stb0899_drv.c 
b/drivers/media/dvb/frontends/stb0899_drv.c
index 38565be..4a58afc 100644
--- a/drivers/media/dvb/frontends/stb0899_drv.c
+++ b/drivers/media/dvb/frontends/stb0899_drv.c
@@ -1071,7 +1071,7 @@  static int stb0899_read_status(struct dvb_frontend 
*fe, enum fe_status *status)
  			reg  = stb0899_read_reg(state, STB0899_VSTATUS);
  			if (STB0899_GETFIELD(VSTATUS_LOCKEDVIT, reg)) {
  				dprintk(state->verbose, FE_DEBUG, 1, "--------> FE_HAS_CARRIER | 
FE_HAS_LOCK");
-				*status |= FE_HAS_CARRIER | FE_HAS_LOCK;
+				*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_LOCK;
   				reg = stb0899_read_reg(state, STB0899_PLPARM);