From a533f5fb7f759113b4e7e1257784c26309710e54 Mon Sep 17 00:00:00 2001 From: Raymond Yau Date: Fri, 13 Jan 2012 10:30:08 +0800 Subject: [PATCH] --- yaml --- r: 285932 b: refs/heads/master c: 7b32486ca449a20d64fa381262cc5e56893f0ac1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/au88x0/au88x0.c | 10 +++++----- trunk/sound/pci/au88x0/au88x0_pcm.c | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 17715c1afd89..30e634f184a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffe535edb9a9c5b4d5fe03dfa3d89a1495580f1b +refs/heads/master: 7b32486ca449a20d64fa381262cc5e56893f0ac1 diff --git a/trunk/sound/pci/au88x0/au88x0.c b/trunk/sound/pci/au88x0/au88x0.c index 762bb108c51c..b8bc11556ed0 100644 --- a/trunk/sound/pci/au88x0/au88x0.c +++ b/trunk/sound/pci/au88x0/au88x0.c @@ -268,6 +268,11 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) card->shortname, chip->io, chip->irq); // (4) Alloc components. + err = snd_vortex_mixer(chip); + if (err < 0) { + snd_card_free(card); + return err; + } // ADB pcm. if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_ADB, NR_ADB)) < 0) { snd_card_free(card); @@ -299,11 +304,6 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) return err; } #endif - // snd_ac97_mixer and Vortex mixer. - if ((err = snd_vortex_mixer(chip)) < 0) { - snd_card_free(card); - return err; - } if ((err = snd_vortex_midi(chip)) < 0) { snd_card_free(card); return err; diff --git a/trunk/sound/pci/au88x0/au88x0_pcm.c b/trunk/sound/pci/au88x0/au88x0_pcm.c index 0488633ea874..0ef2f9712208 100644 --- a/trunk/sound/pci/au88x0/au88x0_pcm.c +++ b/trunk/sound/pci/au88x0/au88x0_pcm.c @@ -168,6 +168,7 @@ static int snd_vortex_pcm_open(struct snd_pcm_substream *substream) runtime->hw = snd_vortex_playback_hw_adb; #ifdef CHIP_AU8830 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && + VORTEX_IS_QUAD(vortex) && VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_ADB) { runtime->hw.channels_max = 4; snd_pcm_hw_constraint_list(runtime, 0,