From c5a6a3920c8f96034fb39938ed8692781774ad48 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 10 Jan 2012 15:16:02 +0100 Subject: [PATCH] --- yaml --- r: 284229 b: refs/heads/master c: 4808d12d1dddb046ec86425e5f6766f02e950292 h: refs/heads/master i: 284227: 1211cfe5a0efdd286340a4e3984dd286f6127e5f v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_via.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 812f6ba58893..4f79c9a306e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a90274de3548ebb2aabfbf488cea8e275a73dc6 +refs/heads/master: 4808d12d1dddb046ec86425e5f6766f02e950292 diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c index ab56866cc94e..03e63fed9caf 100644 --- a/trunk/sound/pci/hda/patch_via.c +++ b/trunk/sound/pci/hda/patch_via.c @@ -2208,7 +2208,10 @@ static int via_auto_create_loopback_switch(struct hda_codec *codec) { struct via_spec *spec = codec->spec; - if (!spec->aa_mix_nid || !spec->out_mix_path.depth) + if (!spec->aa_mix_nid) + return 0; /* no loopback switching available */ + if (!(spec->out_mix_path.depth || spec->hp_mix_path.depth || + spec->speaker_path.depth)) return 0; /* no loopback switching available */ if (!via_clone_control(spec, &via_aamix_ctl_enum)) return -ENOMEM;