summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLydia Wang2011-04-27 11:44:16 +0200
committerTakashi Iwai2011-04-27 11:55:23 +0200
commitcb34c207af4944e9c93e2b462e351430f15daad6 (patch)
tree17bddcfb4ce643d067746ecbaf79ac2367a8fc82 /sound
parentALSA: hda - Enable sync_write workaround for AMD generically (diff)
downloadkernel-qcow2-linux-cb34c207af4944e9c93e2b462e351430f15daad6.tar.gz
kernel-qcow2-linux-cb34c207af4944e9c93e2b462e351430f15daad6.tar.xz
kernel-qcow2-linux-cb34c207af4944e9c93e2b462e351430f15daad6.zip
ALSA: hda - VIA: Fix Smart5.1 isn't useful for 6 audio jacks motherboard.
For some motherboards with 5 or 6 audio jacks which had six or eight multiple channels output, smart5.1 item is no useful and should be removed. Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_via.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 15b57a101aa0..62fe64c419d5 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1021,6 +1021,11 @@ static int via_smart51_build(struct via_spec *spec)
hda_nid_t nid;
int i;
+ if (!cfg)
+ return 0;
+ if (cfg->line_outs > 2)
+ return 0;
+
knew = via_clone_control(spec, &via_smart51_mixer[0]);
if (knew == NULL)
return -ENOMEM;