7 files changed, 15 insertions, 17 deletions

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index ad409381f8cc..b413ed05e74d 100644
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -12,6 +12,9 @@ config SND_HWDEP
 config SND_RAWMIDI
         tristate
 
+config SND_COMPRESS_OFFLOAD
+        tristate
+
 # To be effective this also requires INPUT - users should say:
 #    select SND_JACK if INPUT=y || INPUT=SND
 # to avoid having to force INPUT on.
@@ -154,16 +157,6 @@ config SND_DYNAMIC_MINORS
 
           If you are unsure about this, say N here.
 
-config SND_COMPRESS_OFFLOAD
-        tristate "ALSA Compressed audio offload support"
-        default n
-        help
-          If you want support for offloading compressed audio and have such
-          a hardware, then you should say Y here and also to the DSP driver
-          of your platform.
-
-          If you are unsure about this, say N here.
-
 config SND_SUPPORT_OLD_API
         bool "Support old ALSA API"
         default y
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,
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 0852e204a4c8..fb35474c1203 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2498,6 +2498,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
         SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x10de, 0xcb89, "Macbook Pro 7,1", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 87e684fa830f..3556408d6ece 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1596,7 +1596,7 @@ static const struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd,
                                 "Dell Studio 1557", STAC_DELL_M6_DMIC),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe,
-                                "Dell Studio XPS 1645", STAC_DELL_M6_BOTH),
+                                "Dell Studio XPS 1645", STAC_DELL_M6_DMIC),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413,
                                 "Dell Studio 1558", STAC_DELL_M6_DMIC),
         {} /* terminator */
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index 478303e6c2b0..63cff90706bf 100644
--- a/sound/pci/oxygen/xonar_wm87x6.c
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -177,6 +177,7 @@ static void wm8776_registers_init(struct oxygen *chip)
         struct xonar_wm87x6 *data = chip->model_data;
 
         wm8776_write(chip, WM8776_RESET, 0);
+        wm8776_write(chip, WM8776_PHASESWAP, WM8776_PH_MASK);
         wm8776_write(chip, WM8776_DACCTRL1, WM8776_DZCEN |
                      WM8776_PL_LEFT_LEFT | WM8776_PL_RIGHT_RIGHT);
         wm8776_write(chip, WM8776_DACMUTE, chip->dac_mute ? WM8776_DMUTE : 0);