1 files changed, 20 insertions, 16 deletions

diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c
index c85ab3e31773..c10271aa3628 100644
--- a/drivers/media/dvb/frontends/af9013.c
+++ b/drivers/media/dvb/frontends/af9013.c
@@ -1184,45 +1184,49 @@ static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)
         u8 tmp;
         *status = 0;
 
-        /* TPS lock */
-        ret = af9013_read_reg_bits(state, 0xd330, 3, 1, &tmp);
-        if (ret)
-                goto error;
-        if (tmp)
-                *status |= FE_HAS_VITERBI | FE_HAS_CARRIER | FE_HAS_SIGNAL;
-
         /* MPEG2 lock */
         ret = af9013_read_reg_bits(state, 0xd507, 6, 1, &tmp);
         if (ret)
                 goto error;
         if (tmp)
-                *status |= FE_HAS_SYNC | FE_HAS_LOCK;
+                *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
+                        FE_HAS_SYNC | FE_HAS_LOCK;
 
-        if (!(*status & FE_HAS_SIGNAL)) {
-                /* AGC lock */
-                ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &tmp);
+        if (!*status) {
+                /* TPS lock */
+                ret = af9013_read_reg_bits(state, 0xd330, 3, 1, &tmp);
                 if (ret)
                         goto error;
                 if (tmp)
-                        *status |= FE_HAS_SIGNAL;
+                        *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER |
+                                FE_HAS_VITERBI;
         }
 
-        if (!(*status & FE_HAS_CARRIER)) {
+        if (!*status) {
                 /* CFO lock */
                 ret = af9013_read_reg_bits(state, 0xd333, 7, 1, &tmp);
                 if (ret)
                         goto error;
                 if (tmp)
-                        *status |= FE_HAS_CARRIER;
+                        *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
         }
 
-        if (!(*status & FE_HAS_CARRIER)) {
+        if (!*status) {
                 /* SFOE lock */
                 ret = af9013_read_reg_bits(state, 0xd334, 6, 1, &tmp);
                 if (ret)
                         goto error;
                 if (tmp)
-                        *status |= FE_HAS_CARRIER;
+                        *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
+        }
+
+        if (!*status) {
+                /* AGC lock */
+                ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &tmp);
+                if (ret)
+                        goto error;
+                if (tmp)
+                        *status |= FE_HAS_SIGNAL;
         }
 
         ret = af9013_update_statistics(fe);