diff --git a/[refs] b/[refs]
index 9780a54e9da7..0200b0eb9ffe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cca1b2353a364fd51619d0f304dd9681282b864c
+refs/heads/master: a68a3b4ed4ecafcf80f4272e8e1f0670b387041e
diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c
index aa2cbb1ea988..d68dcbb8dc1f 100644
--- a/trunk/sound/soc/sh/fsi.c
+++ b/trunk/sound/soc/sh/fsi.c
@@ -730,7 +730,6 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
 	u32 data;
 	int is_play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
 	int is_master;
-	int ret = 0;
 
 	pm_runtime_get_sync(dai->dev);
 
@@ -809,7 +808,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
 	/* fifo init */
 	fsi_fifo_init(fsi, is_play, dai);
 
-	return ret;
+	return 0;
 }
 
 static void fsi_dai_shutdown(struct snd_pcm_substream *substream,