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: hda - Fix silent output on Haier W18 laptop
  ALSA: hda: set mute led polarity for laptops with buggy BIOS based on SSID
  ALSA: hda - Fix silent output on ASUS A6Rp
  ALSA: Fix memory leak on error in snd_compr_set_params()
  ALSA: ymfpci - Don't create invalid PCM & mixers when AC97 doesn't support

5 files changed, 54 insertions, 21 deletions

diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index dac3633507c..a68aed7fce0 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -441,19 +441,22 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg)
                 params = kmalloc(sizeof(*params), GFP_KERNEL);
                 if (!params)
                         return -ENOMEM;
-                if (copy_from_user(params, (void __user *)arg, sizeof(*params)))
-                        return -EFAULT;
+                if (copy_from_user(params, (void __user *)arg, sizeof(*params))) {
+                        retval = -EFAULT;
+                        goto out;
+                }
                 retval = snd_compr_allocate_buffer(stream, params);
                 if (retval) {
-                        kfree(params);
-                        return -ENOMEM;
+                        retval = -ENOMEM;
+                        goto out;
                 }
                 retval = stream->ops->set_params(stream, params);
                 if (retval)
                         goto out;
                 stream->runtime->state = SNDRV_PCM_STATE_SETUP;
-        } else
+        } else {
                 return -EPERM;
+        }
 out:
         kfree(params);
         return retval;
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index c95c8bde12d..0db1dc49382 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5586,6 +5586,7 @@ static const struct hda_amp_list alc861_loopbacks[] = {
 /* Pin config fixes */
 enum {
         PINFIX_FSC_AMILO_PI1505,
+        PINFIX_ASUS_A6RP,
 };
 
 static const struct alc_fixup alc861_fixups[] = {
@@ -5597,9 +5598,19 @@ static const struct alc_fixup alc861_fixups[] = {
                         { }
                 }
         },
+        [PINFIX_ASUS_A6RP] = {
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        /* node 0x0f VREF seems controlling the master output */
+                        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
+                        { }
+                },
+        },
 };
 
 static const struct snd_pci_quirk alc861_fixup_tbl[] = {
+        SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", PINFIX_ASUS_A6RP),
+        SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", PINFIX_ASUS_A6RP),
         SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505),
         {}
 };
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 336cfcd324f..948f0be2f4f 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4870,7 +4870,14 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)
                         /* BIOS bug: unfilled OEM string */
                         if (strstr(dev->name, "HP_Mute_LED_P_G")) {
                                 set_hp_led_gpio(codec);
-                                spec->gpio_led_polarity = 1;
+                                switch (codec->subsystem_id) {
+                                case 0x103c148a:
+                                        spec->gpio_led_polarity = 0;
+                                        break;
+                                default:
+                                        spec->gpio_led_polarity = 1;
+                                        break;
+                                }
                                 return 1;
                         }
                 }
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index e57b89e8aa8..94ab728f5ca 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -286,17 +286,22 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_ymfpci_pcm_4ch(chip, 2, NULL)) < 0) {
+        err = snd_ymfpci_mixer(chip, rear_switch[dev]);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_ymfpci_pcm2(chip, 3, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_ymfpci_mixer(chip, rear_switch[dev])) < 0) {
-                snd_card_free(card);
-                return err;
+        if (chip->ac97->ext_id & AC97_EI_SDAC) {
+                err = snd_ymfpci_pcm_4ch(chip, 2, NULL);
+                if (err < 0) {
+                        snd_card_free(card);
+                        return err;
+                }
+                err = snd_ymfpci_pcm2(chip, 3, NULL);
+                if (err < 0) {
+                        snd_card_free(card);
+                        return err;
+                }
         }
         if ((err = snd_ymfpci_timer(chip, 0)) < 0) {
                 snd_card_free(card);
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 03ee4e36531..12a9a2b0338 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -1614,6 +1614,14 @@ static int snd_ymfpci_put_dup4ch(struct snd_kcontrol *kcontrol, struct snd_ctl_e
         return change;
 }
 
+static struct snd_kcontrol_new snd_ymfpci_dup4ch __devinitdata = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "4ch Duplication",
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+        .info = snd_ymfpci_info_dup4ch,
+        .get = snd_ymfpci_get_dup4ch,
+        .put = snd_ymfpci_put_dup4ch,
+};
 
 static struct snd_kcontrol_new snd_ymfpci_controls[] __devinitdata = {
 {
@@ -1642,13 +1650,6 @@ YMFPCI_DOUBLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,VOLUME), 1, YDSXGR_SPDIFLOOPVOL),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), 0, YDSXGR_SPDIFOUTCTRL, 0),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, YDSXGR_SPDIFINCTRL, 0),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("Loop",NONE,NONE), 0, YDSXGR_SPDIFINCTRL, 4),
-{
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "4ch Duplication",
-        .info = snd_ymfpci_info_dup4ch,
-        .get = snd_ymfpci_get_dup4ch,
-        .put = snd_ymfpci_put_dup4ch,
-},
 };
 
 
@@ -1838,6 +1839,12 @@ int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch)
                 if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_ymfpci_controls[idx], chip))) < 0)
                         return err;
         }
+        if (chip->ac97->ext_id & AC97_EI_SDAC) {
+                kctl = snd_ctl_new1(&snd_ymfpci_dup4ch, chip);
+                err = snd_ctl_add(chip->card, kctl);
+                if (err < 0)
+                        return err;
+        }
 
         /* add S/PDIF control */
         if (snd_BUG_ON(!chip->pcm_spdif))