Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 697aebab78a88c6b164cfb74d19b86817d2ccd82

Authored by Takashi Iwai
1 parent 209fb1b7e2
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

ALSA: hda - Fix missing fixup for Mac Mini with STAC9221 

A fixup for Apple Mac Mini was lost during the adaption to the generic
parser because the fallback for the generic ID 8384:7680 was dropped,
and it resulted in the silence output (and maybe other problems).

Unfortunately, just adding the missing subsystem ID wasn't enough, in
this case.  The subsystem ID of this machine is 0000:0100 (what Apple
thought...?), and since snd_hda_pick_fixup() doesn't take the vendor
id zero into account, the driver ignored this entry.  Now it's fixed
to regard the vendor id zero as a valid value.

Reported-and-tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: <stable@vger.kernel.org> [v3.9+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 2 changed files with 2 additions and 1 deletions Side-by-side Diff

sound/pci/hda/hda_auto_parser.c
Diff comments   View file @ 697aeba
... ... @@ -860,7 +860,7 @@
860 860 }
861 861 }
862 862 if (id < 0 && quirk) {
863   - for (q = quirk; q->subvendor; q++) {
  863 + for (q = quirk; q->subvendor || q->subdevice; q++) {
864 864 unsigned int vendorid =
865 865 q->subdevice | (q->subvendor << 16);
866 866 unsigned int mask = 0xffff0000 | q->subdevice_mask;
sound/pci/hda/patch_sigmatel.c
Diff comments   View file @ 697aeba
... ... @@ -2819,6 +2819,7 @@
2819 2819  
2820 2820 /* codec SSIDs for Intel Mac sharing the same PCI SSID 8384:7680 */
2821 2821 static const struct snd_pci_quirk stac922x_intel_mac_fixup_tbl[] = {
  2822 + SND_PCI_QUIRK(0x0000, 0x0100, "Mac Mini", STAC_INTEL_MAC_V3),
2822 2823 SND_PCI_QUIRK(0x106b, 0x0800, "Mac", STAC_INTEL_MAC_V1),
2823 2824 SND_PCI_QUIRK(0x106b, 0x0600, "Mac", STAC_INTEL_MAC_V2),
2824 2825 SND_PCI_QUIRK(0x106b, 0x0700, "Mac", STAC_INTEL_MAC_V2),