diff --git a/[refs] b/[refs]
index f222b203df2b..ae1b9b78618e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76952c7e598f68bf12adf307d6a9a0de3b33b985
+refs/heads/master: e65f8c4e3eef3a0946f8e8fba1fb6aabde734f50
diff --git a/trunk/drivers/media/dvb/frontends/stv6110x.c b/trunk/drivers/media/dvb/frontends/stv6110x.c
index 42591ce1aaad..f36cab12bdc7 100644
--- a/trunk/drivers/media/dvb/frontends/stv6110x.c
+++ b/trunk/drivers/media/dvb/frontends/stv6110x.c
@@ -303,7 +303,10 @@ static int stv6110x_set_mode(struct dvb_frontend *fe, enum tuner_mode mode)
 
 static int stv6110x_sleep(struct dvb_frontend *fe)
 {
-	return stv6110x_set_mode(fe, TUNER_SLEEP);
+	if (fe->tuner_priv)
+		return stv6110x_set_mode(fe, TUNER_SLEEP);
+
+	return 0;
 }
 
 static int stv6110x_get_status(struct dvb_frontend *fe, u32 *status)