From: David Henningsson <david.henningsson@canonical.com>
Date: Mon, 2 Aug 2010 11:13:25 +0000 (+0200)
Subject: ALSA: hda - Do not try to create speaker NIDs for ALC268 if there aren't any
X-Git-Tag: v3.12-rc1~8932^2~18^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7bfb9c031ec2d220d48bf679553d6177c2e66625;p=kernel%2Fkernel-generic.git

ALSA: hda - Do not try to create speaker NIDs for ALC268 if there aren't any

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 49c04fc..cf14b00 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -13216,7 +13216,7 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,
 				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
 		if (err < 0)
 			return err;
-	} else {
+	} else if (nid) {
 		err = alc268_new_analog_output(spec, nid, "Speaker", 0);
 		if (err < 0)
 			return err;