diff --git a/[refs] b/[refs]
index f67b64942c39..cd66a284e5fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ca2aa9c59c39805c746b137c041576838f3de92
+refs/heads/master: cb13c6b3ca8a1d72996ab1b6a43e291219993292
diff --git a/trunk/sound/soc/codecs/wm8804.c b/trunk/sound/soc/codecs/wm8804.c
index ca7d9eea1264..40e5067e8246 100644
--- a/trunk/sound/soc/codecs/wm8804.c
+++ b/trunk/sound/soc/codecs/wm8804.c
@@ -669,7 +669,7 @@ static struct snd_soc_dai_ops wm8804_dai_ops = {
 			SNDRV_PCM_FMTBIT_S24_LE)
 
 static struct snd_soc_dai_driver wm8804_dai = {
-	.name = "wm8804-s/pdif",
+	.name = "wm8804-spdif",
 	.playback = {
 		.stream_name = "Playback",
 		.channels_min = 2,