3 files changed, 9 insertions, 6 deletions

diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 762bb108c51c..f13ad536b2d5 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -268,8 +268,14 @@ 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) {
+        err = snd_vortex_new_pcm(chip, VORTEX_PCM_ADB, NR_PCM);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
@@ -299,11 +305,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/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h
index 02f6e08f7592..bb938153a964 100644
--- a/sound/pci/au88x0/au88x0.h
+++ b/sound/pci/au88x0/au88x0.h
@@ -105,6 +105,7 @@
 #define MIX_SPDIF(x) (vortex->mixspdif[x])
 
 #define NR_WTPB 0x20            /* WT channels per each bank. */
+#define NR_PCM  0x10
 
 /* Structs */
 typedef struct {
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index 0488633ea874..0ef2f9712208 100644
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/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,