lkml.org 
[lkml]   [2013]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 020/102] ALSA: hda - Fix missing fixup for Mac Mini with STAC9221
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit 697aebab78a88c6b164cfb74d19b86817d2ccd82 upstream.

    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>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/sound/pci/hda/hda_auto_parser.c
    +++ b/sound/pci/hda/hda_auto_parser.c
    @@ -860,7 +860,7 @@ void snd_hda_pick_fixup(struct hda_codec
    }
    }
    if (id < 0 && quirk) {
    - for (q = quirk; q->subvendor; q++) {
    + for (q = quirk; q->subvendor || q->subdevice; q++) {
    unsigned int vendorid =
    q->subdevice | (q->subvendor << 16);
    unsigned int mask = 0xffff0000 | q->subdevice_mask;
    --- a/sound/pci/hda/patch_sigmatel.c
    +++ b/sound/pci/hda/patch_sigmatel.c
    @@ -2815,6 +2815,7 @@ static const struct hda_pintbl ecs202_pi

    /* codec SSIDs for Intel Mac sharing the same PCI SSID 8384:7680 */
    static const struct snd_pci_quirk stac922x_intel_mac_fixup_tbl[] = {
    + SND_PCI_QUIRK(0x0000, 0x0100, "Mac Mini", STAC_INTEL_MAC_V3),
    SND_PCI_QUIRK(0x106b, 0x0800, "Mac", STAC_INTEL_MAC_V1),
    SND_PCI_QUIRK(0x106b, 0x0600, "Mac", STAC_INTEL_MAC_V2),
    SND_PCI_QUIRK(0x106b, 0x0700, "Mac", STAC_INTEL_MAC_V2),



    \
     
     \ /
      Last update: 2013-08-09 05:01    [W:9.128 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site