diff --git a/[refs] b/[refs]
index 8b3bc692cedb..436ad12e4760 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 277a57c710ff73af1213f5d4b42bf6458c1ebca3
+refs/heads/master: 63b2413b2ff446e30286c2bd775fd10b12d188c6
diff --git a/trunk/sound/pci/hda/patch_cirrus.c b/trunk/sound/pci/hda/patch_cirrus.c
index 57251d72b124..f5527380a245 100644
--- a/trunk/sound/pci/hda/patch_cirrus.c
+++ b/trunk/sound/pci/hda/patch_cirrus.c
@@ -779,6 +779,9 @@ static int build_digital_output(struct hda_codec *codec)
 	struct cs_spec *spec = codec->spec;
 	int err;
 
+	if (!spec->multiout.dig_out_nid)
+		return 0;
+
 	err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
 	if (err < 0)
 		return err;