diff --git a/[refs] b/[refs]
index 040af2a1631d..8cd0986bcb91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0e52d4e9f5bce7ea887027c127473eb654a5a04
+refs/heads/master: ffd491fd6f4129c201926edbbd63e2088d82d2fa
diff --git a/trunk/drivers/media/common/tuners/qt1010.c b/trunk/drivers/media/common/tuners/qt1010.c
index 2d79b1f5d5eb..bdc39e11030e 100644
--- a/trunk/drivers/media/common/tuners/qt1010.c
+++ b/trunk/drivers/media/common/tuners/qt1010.c
@@ -288,7 +288,7 @@ static int qt1010_init_meas1(struct qt1010_priv *priv,
 	return qt1010_writereg(priv, 0x1e, 0x00);
 }
 
-static u8 qt1010_init_meas2(struct qt1010_priv *priv,
+static int qt1010_init_meas2(struct qt1010_priv *priv,
 			    u8 reg_init_val, u8 *retval)
 {
 	u8 i, val;