6 files changed, 90 insertions, 7 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index c9ad182e1b4b..6517f589d01d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -722,9 +722,10 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
                    chip->last_cmd[addr]);
         chip->single_cmd = 1;
         bus->response_reset = 0;
-        /* re-initialize CORB/RIRB */
+        /* release CORB/RIRB */
         azx_free_cmd_io(chip);
-        azx_init_cmd_io(chip);
+        /* disable unsolicited responses */
+        azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_UNSOL);
         return -1;
 }
 
@@ -865,7 +866,9 @@ static int azx_reset(struct azx *chip)
         }
 
         /* Accept unsolicited responses */
-        azx_writel(chip, GCTL, azx_readl(chip, GCTL) | ICH6_GCTL_UNSOL);
+        if (!chip->single_cmd)
+                azx_writel(chip, GCTL, azx_readl(chip, GCTL) |
+                           ICH6_GCTL_UNSOL);
 
         /* detect codecs */
         if (!chip->codec_mask) {
@@ -980,7 +983,8 @@ static void azx_init_chip(struct azx *chip)
         azx_int_enable(chip);
 
         /* initialize the codec command I/O */
-        azx_init_cmd_io(chip);
+        if (!chip->single_cmd)
+                azx_init_cmd_io(chip);
 
         /* program the position buffer */
         azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
@@ -2674,6 +2678,7 @@ static struct pci_device_id azx_ids[] = {
         { PCI_DEVICE(0x10de, 0x044b), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x055c), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x055d), .driver_data = AZX_DRIVER_NVIDIA },
+        { PCI_DEVICE(0x10de, 0x0590), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0774), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0775), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0776), .driver_data = AZX_DRIVER_NVIDIA },
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 3fbbc8c01e70..6479e65858d3 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -2325,6 +2325,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
                       CXT5066_LAPTOP),
         SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",
                       CXT5066_DELL_LAPTOP),
+        SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
         {}
 };
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index c08ca660daba..ff20048504b6 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -965,6 +965,8 @@ static void alc_automute_pin(struct hda_codec *codec)
         unsigned int nid = spec->autocfg.hp_pins[0];
         int i;
 
+        if (!nid)
+                return;
         pincap = snd_hda_query_pin_caps(codec, nid);
         if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */
                 snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0);
@@ -12602,7 +12604,8 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One",
                                                 ALC268_ACER_ASPIRE_ONE),
         SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
-        SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),
+        SND_PCI_QUIRK_MASK(0x1028, 0xfff0, 0x02b0,
+                        "Dell Inspiron Mini9/Vostro A90", ALC268_DELL),
         /* almost compatible with toshiba but with optional digital outs;
          * auto-probing seems working fine
          */
@@ -17374,7 +17377,7 @@ static int alc662_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
 
 /* create playback/capture controls for input pins */
 #define alc662_auto_create_input_ctls \
-        alc880_auto_create_input_ctls
+        alc882_auto_create_input_ctls
 
 static void alc662_auto_set_output_and_unmute(struct hda_codec *codec,
                                               hda_nid_t nid, int pin_type,
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 66c0876bf734..8eb6508cd991 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
+#include <linux/dmi.h>
 #include <sound/core.h>
 #include <sound/asoundef.h>
 #include <sound/jack.h>
@@ -1693,6 +1694,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
                       "DFI LanParty", STAC_92HD71BXX_REF),
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fb,
                       "HP dv4-1222nr", STAC_HP_DV4_1222NR),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x1720,
+                          "HP", STAC_HP_DV5),
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080,
                       "HP", STAC_HP_DV5),
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0,
@@ -4665,6 +4668,26 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
         }
 }
 
+static int hp_bseries_system(u32 subsystem_id)
+{
+        switch (subsystem_id) {
+        case 0x103c307e:
+        case 0x103c307f:
+        case 0x103c3080:
+        case 0x103c3081:
+        case 0x103c1722:
+        case 0x103c1723:
+        case 0x103c1724:
+        case 0x103c1725:
+        case 0x103c1726:
+        case 0x103c1727:
+        case 0x103c1728:
+        case 0x103c1729:
+                return 1;
+        }
+        return 0;
+}
+
 #ifdef CONFIG_PROC_FS
 static void stac92hd_proc_hook(struct snd_info_buffer *buffer,
                                struct hda_codec *codec, hda_nid_t nid)
@@ -4754,6 +4777,11 @@ static int stac92xx_hp_check_power_status(struct hda_codec *codec,
                 else
                         spec->gpio_data |= spec->gpio_led; /* white */
 
+                if (hp_bseries_system(codec->subsystem_id)) {
+                        /* LED state is inverted on these systems */
+                        spec->gpio_data ^= spec->gpio_led;
+                }
+
                 stac_gpio_set(codec, spec->gpio_mask,
                               spec->gpio_dir,
                               spec->gpio_data);
@@ -5243,6 +5271,7 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec;
         struct hda_verb *unmute_init = stac92hd71bxx_unmute_core_init;
+        unsigned int pin_cfg;
         int err = 0;
 
         spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
@@ -5426,6 +5455,45 @@ again:
                 break;
         }
 
+        if (hp_bseries_system(codec->subsystem_id)) {
+                pin_cfg = snd_hda_codec_get_pincfg(codec, 0x0f);
+                if (get_defcfg_device(pin_cfg) == AC_JACK_LINE_OUT ||
+                        get_defcfg_device(pin_cfg) == AC_JACK_SPEAKER  ||
+                        get_defcfg_device(pin_cfg) == AC_JACK_HP_OUT) {
+                        /* It was changed in the BIOS to just satisfy MS DTM.
+                         * Lets turn it back into slaved HP
+                         */
+                        pin_cfg = (pin_cfg & (~AC_DEFCFG_DEVICE))
+                                        | (AC_JACK_HP_OUT <<
+                                                AC_DEFCFG_DEVICE_SHIFT);
+                        pin_cfg = (pin_cfg & (~(AC_DEFCFG_DEF_ASSOC
+                                                        | AC_DEFCFG_SEQUENCE)))
+                                                                | 0x1f;
+                        snd_hda_codec_set_pincfg(codec, 0x0f, pin_cfg);
+                }
+        }
+
+        if ((codec->subsystem_id >> 16) == PCI_VENDOR_ID_HP) {
+                const struct dmi_device *dev = NULL;
+                while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING,
+                                              NULL, dev))) {
+                        if (strcmp(dev->name, "HP_Mute_LED_1")) {
+                                switch (codec->vendor_id) {
+                                case 0x111d7608:
+                                        spec->gpio_led = 0x01;
+                                        break;
+                                case 0x111d7600:
+                                case 0x111d7601:
+                                case 0x111d7602:
+                                case 0x111d7603:
+                                        spec->gpio_led = 0x08;
+                                        break;
+                                }
+                                break;
+                        }
+                }
+        }
+
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (spec->gpio_led) {
                 spec->gpio_mask |= spec->gpio_led;
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c
index c75515f5be6f..6a9fee3ee78f 100644
--- a/sound/pci/ice1712/prodigy_hifi.c
+++ b/sound/pci/ice1712/prodigy_hifi.c
@@ -1100,7 +1100,7 @@ static void ak4396_init(struct snd_ice1712 *ice)
 }
 
 #ifdef CONFIG_PM
-static int __devinit prodigy_hd2_resume(struct snd_ice1712 *ice)
+static int prodigy_hd2_resume(struct snd_ice1712 *ice)
 {
         /* initialize ak4396 codec and restore previous mixer volumes */
         struct prodigy_hifi_spec *spec = ice->spec;
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 754867ed4785..aac20fb4aad2 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1950,6 +1950,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
         },
         {
                 .subvendor = 0x104d,
+                .subdevice = 0x8144,
+                .name = "Sony",
+                .type = AC97_TUNE_INV_EAPD
+        },
+        {
+                .subvendor = 0x104d,
                 .subdevice = 0x8197,
                 .name = "Sony S1XP",
                 .type = AC97_TUNE_INV_EAPD