From 248cd0ea631458d0c1f4f8c4886f8b8550d1309e Mon Sep 17 00:00:00 2001
From: Mengdong Lin <mengdong.lin@intel.com>
Date: Thu, 7 Mar 2013 14:10:25 -0500
Subject: [PATCH] --- yaml --- r: 360965 b: refs/heads/master c:
 25336e8ae2d2fa64c9c4cc2c9c28f641134c9fa9 h: refs/heads/master i:   360963:
 956fb3fa834d97d95693fa06a33aa797d99a5824 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 04dd5d6f70c8..133d9cd28bed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fedcc44f10d1e6820914f93a96d51bc7e653d98
+refs/heads/master: 25336e8ae2d2fa64c9c4cc2c9c28f641134c9fa9
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index 04b57383e8cb..3dc656688c08 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -3334,6 +3334,8 @@ int snd_hda_create_dig_out_ctls(struct hda_codec *codec,
 		return -EBUSY;
 	}
 	spdif = snd_array_new(&codec->spdif_out);
+	if (!spdif)
+		return -ENOMEM;
 	for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {
 		kctl = snd_ctl_new1(dig_mix, codec);
 		if (!kctl)