summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2010-08-02 13:13:25 +0200
committerTakashi Iwai <tiwai@suse.de>2010-08-02 14:51:01 +0200
commit7bfb9c031ec2d220d48bf679553d6177c2e66625 (patch)
tree9771798d7144d0bbdc4d77d4c5aa0e65bcd2a502 /sound/pci
parentc7a9434dd6ea74464b0419a274463c914197bc98 (diff)
downloadlinux-7bfb9c031ec2d220d48bf679553d6177c2e66625.tar.bz2
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>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 49c04fc8b516..cf14b00155d0 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;