Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: virtuoso: Xonar DS: fix polarity of front output
  ALSA: Au88x0 - Reduce the number of playback subdevices of au8830 from 32 to 16
  ALSA: Au88x0 - Support 4 channels playback when AC97 codecs has SDAC bit
  ALSA: HDA: Fix internal microphone on Dell Studio 16 XPS 1645
  ALSA: Don't prompt for CONFIG_SND_COMPRESS_OFFLOAD
  ALSA: HDA: Use LPIB position fix for Macbook Pro 7,1

1 files changed, 7 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;