diff --git a/[refs] b/[refs]
index 6bea29f3ce91..5f3eed0618ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb6c96345d07c7c3978e77d3ad0b5c5b9e5b2faa
+refs/heads/master: 10f201af1bedd39a88913f472b33698c4a3b0680
diff --git a/trunk/drivers/media/common/tuners/tuner-xc2028.c b/trunk/drivers/media/common/tuners/tuner-xc2028.c
index 8a964b417a75..7b7e242cae16 100644
--- a/trunk/drivers/media/common/tuners/tuner-xc2028.c
+++ b/trunk/drivers/media/common/tuners/tuner-xc2028.c
@@ -1104,7 +1104,7 @@ static int xc2028_sleep(struct dvb_frontend *fe)
 
 	/* Avoid firmware reload on slow devices */
 	if (no_poweroff)
-		return;
+		return 0;
 
 	tuner_dbg("Putting xc2028/3028 into poweroff mode.\n");