diff --git a/[refs] b/[refs]
index b46821bccc1b..f1cd26df5a44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf91141d3565b35fb2a44364bfb874a3be3c12b6
+refs/heads/master: 3a3bd960a0b7bb26604b1270a8b4cafdc5883040
diff --git a/trunk/sound/soc/fsl/fsl_ssi.c b/trunk/sound/soc/fsl/fsl_ssi.c
index b2a11b0d2e4c..f588545698f3 100644
--- a/trunk/sound/soc/fsl/fsl_ssi.c
+++ b/trunk/sound/soc/fsl/fsl_ssi.c
@@ -416,7 +416,7 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd)
 			 * to put data into its FIFO.  Without it, ALSA starts
 			 * to complain about overruns.
 			 */
-			msleep(1);
+			mdelay(1);
 		}
 		break;