Patch "ALSA: hda - Apply fixup for another Toshiba Satellite S50D" has been added to the 4.1-stable tree

Patch "ALSA: hda - Apply fixup for another Toshiba Satellite S50D" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    ALSA: hda - Apply fixup for another Toshiba Satellite S50D

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     alsa-hda-apply-fixup-for-another-toshiba-satellite-s50d.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From b9d9c9efc292dd0ffe172780f915ed74eba3556c Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 27 Jul 2015 10:13:37 +0200
Subject: ALSA: hda - Apply fixup for another Toshiba Satellite S50D

From: Takashi Iwai <tiwai@suse.de>

commit b9d9c9efc292dd0ffe172780f915ed74eba3556c upstream.

Toshiba Satellite S50D has another model with a different PCI SSID
(1179:fa93) while the previous fixup was for 1179:fa91.  Adjust the
fixup entry with SND_PCI_QUIRK_MASK() to match with both devices.

Reported-by: Tim Sample <timsample@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 sound/pci/hda/patch_sigmatel.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2920,7 +2920,8 @@ static const struct snd_pci_quirk stac92
 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x148a,
 		      "HP Mini", STAC_92HD83XXX_HP_LED),
 	SND_PCI_QUIRK_VENDOR(PCI_VENDOR_ID_HP, "HP", STAC_92HD83XXX_HP),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_TOSHIBA, 0xfa91,
+	/* match both for 0xfa91 and 0xfa93 */
+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_TOSHIBA, 0xfffd, 0xfa91,
 		      "Toshiba Satellite S50D", STAC_92HD83XXX_GPIO10_EAPD),
 	{} /* terminator */
 };


Patches currently in stable-queue which might be from tiwai@suse.de are

queue-4.1/alsa-line6-fix-ebusy-error-during-active-monitoring.patch
queue-4.1/alsa-hda-add-new-amd-pci-ids-with-proper-driver-caps.patch
queue-4.1/alsa-usb-audio-add-midi-support-for-steinberg-mi2-mi4.patch
queue-4.1/alsa-hda-apply-fixup-for-another-toshiba-satellite-s50d.patch
queue-4.1/alsa-pcm-fix-lockdep-warning-with-nonatomic-pcm-ops.patch
queue-4.1/alsa-hda-add-new-gpu-codec-id-0x10de007d-to-snd-hda.patch
queue-4.1/alsa-usb-audio-add-db-range-mapping-for-some-devices.patch
queue-4.1/alsa-hda-add-headset-mic-support-for-acer-aspire-v5-573g.patch
queue-4.1/alsa-hda-apply-a-fixup-to-dell-vostro-5480.patch
queue-4.1/alsa-hda-fix-macbook-pro-5-2-quirk.patch
queue-4.1/alsa-hda-add-headset-mic-pin-quirk-for-a-dell-device.patch