1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c
index 0e209b56c76c..c6abeb4fba9d 100644
--- a/drivers/media/dvb-frontends/tda1004x.c
+++ b/drivers/media/dvb-frontends/tda1004x.c
@@ -903,9 +903,18 @@ static int tda1004x_get_fe(struct dvb_frontend *fe)
 {
         struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache;
         struct tda1004x_state* state = fe->demodulator_priv;
+        int status;
 
         dprintk("%s\n", __func__);
 
+        status = tda1004x_read_byte(state, TDA1004X_STATUS_CD);
+        if (status == -1)
+                return -EIO;
+
+        /* Only update the properties cache if device is locked */
+        if (!(status & 8))
+                return 0;
+
         // inversion status
         fe_params->inversion = INVERSION_OFF;
         if (tda1004x_read_byte(state, TDA1004X_CONFC1) & 0x20)