From babb8e63e3b81167e15052e82a7914930e5fee04 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 6 Feb 2009 16:21:20 +0100
Subject: [PATCH] --- yaml --- r: 133026 b: refs/heads/master c:
 c8dcdf829ca1827a802eae841dd04de8c9d6653f h: refs/heads/master 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 e7688cfd46a0..ec17cf5e827a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d95ad4a9c04129f581fdffe01a379682e420ad9c
+refs/heads/master: c8dcdf829ca1827a802eae841dd04de8c9d6653f
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index c9158799ccb6..93412f335dc4 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -1984,6 +1984,8 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
 	}
 	for (dig_mix = dig_in_ctls; dig_mix->name; dig_mix++) {
 		kctl = snd_ctl_new1(dig_mix, codec);
+		if (!kctl)
+			return -ENOMEM;
 		kctl->private_value = nid;
 		err = snd_hda_ctl_add(codec, kctl);
 		if (err < 0)