Merge branch 'for-linus' into for-next

5 files changed, 9 insertions, 5 deletions

diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index 7f57a145a47e..4ad29f8d7a4a 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -901,7 +901,7 @@ static bool pin_config_match(struct hda_codec *codec,
                 for (; t_pins->nid; t_pins++) {
                         if (t_pins->nid == nid) {
                                 found = 1;
-                                if (t_pins->val == cfg)
+                                if ((t_pins->val & 0xfffffff0) == (cfg & 0xfffffff0))
                                         break;
                                 else if ((cfg & 0xf0000000) == 0x40000000 && (t_pins->val & 0xf0000000) == 0x40000000)
                                         break;
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index ad06866d7c69..11b9b2f17a2e 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -780,6 +780,7 @@ static const struct hda_pintbl alienware_pincfgs[] = {
 static const struct snd_pci_quirk ca0132_quirks[] = {
         SND_PCI_QUIRK(0x1028, 0x0685, "Alienware 15 2015", QUIRK_ALIENWARE),
         SND_PCI_QUIRK(0x1028, 0x0688, "Alienware 17 2015", QUIRK_ALIENWARE),
+        SND_PCI_QUIRK(0x1028, 0x0708, "Alienware 15 R2 2016", QUIRK_ALIENWARE),
         {}
 };
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 47224c69cc06..64c22ccf239b 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5917,6 +5917,9 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                 {0x12, 0x90a60180},
                 {0x14, 0x90170120},
                 {0x21, 0x02211030}),
+        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+                {0x1b, 0x01011020},
+                {0x21, 0x02211010}),
         SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
                 {0x12, 0x90a60160},
                 {0x14, 0x90170120},
@@ -6907,8 +6910,6 @@ static const struct hda_fixup alc662_fixups[] = {
                 .v.pins = (const struct hda_pintbl[]) {
                         { 0x15, 0x40f000f0 }, /* disabled */
                         { 0x16, 0x40f000f0 }, /* disabled */
-                        { 0x18, 0x01014011 }, /* LO */
-                        { 0x1a, 0x01014012 }, /* LO */
                         { }
                 }
         },
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c
index 6a23302297c9..4d9d320a7971 100644
--- a/sound/pci/hda/thinkpad_helper.c
+++ b/sound/pci/hda/thinkpad_helper.c
@@ -13,7 +13,8 @@ static void (*old_vmaster_hook)(void *, int);
 static bool is_thinkpad(struct hda_codec *codec)
 {
         return (codec->core.subsystem_id >> 16 == 0x17aa) &&
-               (acpi_dev_found("LEN0068") || acpi_dev_found("IBM0068"));
+               (acpi_dev_found("LEN0068") || acpi_dev_found("LEN0268") ||
+                acpi_dev_found("IBM0068"));
 }
 
 static void update_tpacpi_mute_led(void *private_data, int enabled)
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 9e5276d6dda0..2ddc034673a8 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -315,7 +315,8 @@ static int snd_usb_audio_free(struct snd_usb_audio *chip)
                 snd_usb_endpoint_free(ep);
 
         mutex_destroy(&chip->mutex);
-        dev_set_drvdata(&chip->dev->dev, NULL);
+        if (!atomic_read(&chip->shutdown))
+                dev_set_drvdata(&chip->dev->dev, NULL);
         kfree(chip);
         return 0;
 }