diff --git a/[refs] b/[refs]
index 5d5a3a4c08b7..3f7afc35d1b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35e60448b98be847a7066134442789222a1916ea
+refs/heads/master: cf1ff5011614cad540fa872b46552d078b510c38
diff --git a/trunk/sound/soc/codecs/wm8985.c b/trunk/sound/soc/codecs/wm8985.c
index b94af96f2bd7..6658c9440e04 100644
--- a/trunk/sound/soc/codecs/wm8985.c
+++ b/trunk/sound/soc/codecs/wm8985.c
@@ -644,7 +644,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream,
 			    struct snd_pcm_hw_params *params,
 			    struct snd_soc_dai *dai)
 {
-	size_t i;
+	int i;
 	struct snd_soc_codec *codec;
 	struct wm8985_priv *wm8985;
 	u16 blen, srate_idx;