diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-02 14:51:13 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-02 14:51:13 +0200 |
| commit | 284f062cc71f81b1f5c665eb17d6c6058c3eea78 (patch) | |
| tree | 3a3cf61fb6d6439ed07cc2c666815cd59a1c98b2 /sound | |
| parent | 916a936ae4c3c090bbc01349c37d4a9eebca2373 (diff) | |
| parent | 7bfb9c031ec2d220d48bf679553d6177c2e66625 (diff) | |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
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; |