Date: Wed, 25 Jan 2012 09:57:34 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r230532 - head/sys/dev/sound/pci/hda Message-ID: <201201250957.q0P9vYq2017256@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Wed Jan 25 09:57:34 2012 New Revision: 230532 URL: http://svn.freebsd.org/changeset/base/230532 Log: Fix word order in hdaa_subvendor_id() to match PCI (where it comes from), broken at r230130. This should fix applying system-specific patches. Modified: head/sys/dev/sound/pci/hda/hdaa.h head/sys/dev/sound/pci/hda/hdaa_patches.c Modified: head/sys/dev/sound/pci/hda/hdaa.h ============================================================================== --- head/sys/dev/sound/pci/hda/hdaa.h Wed Jan 25 08:53:42 2012 (r230531) +++ head/sys/dev/sound/pci/hda/hdaa.h Wed Jan 25 09:57:34 2012 (r230532) @@ -259,8 +259,8 @@ struct hdaa_chan { hda_get_device_id(devinfo->dev)) #define hdaa_subvendor_id(devinfo) \ - (((uint32_t)hda_get_subvendor_id(devinfo->dev) << 16) + \ - hda_get_subdevice_id(devinfo->dev)) + (((uint32_t)hda_get_subdevice_id(devinfo->dev) << 16) + \ + hda_get_subvendor_id(devinfo->dev)) struct hdaa_widget *hdaa_widget_get(struct hdaa_devinfo *, nid_t); uint32_t hdaa_widget_pin_patch(uint32_t config, const char *str); Modified: head/sys/dev/sound/pci/hda/hdaa_patches.c ============================================================================== --- head/sys/dev/sound/pci/hda/hdaa_patches.c Wed Jan 25 08:53:42 2012 (r230531) +++ head/sys/dev/sound/pci/hda/hdaa_patches.c Wed Jan 25 09:57:34 2012 (r230532) @@ -620,9 +620,9 @@ hdaa_patch_direct(struct hdaa_devinfo *d hda_command(dev, HDA_CMD_12BIT(0, devinfo->nid, 0x7e7, 0)); if (id == HDA_CODEC_ALC269) { - if (subid == 0x104316e3 || subid == 0x1043831a || - subid == 0x1043834a || subid == 0x10438398 || - subid == 0x104383ce) { + if (subid == 0x16e31043 || subid == 0x831a1043 || + subid == 0x834a1043 || subid == 0x83981043 || + subid == 0x83ce1043) { /* * The ditital mics on some Asus laptops produce * differential signals instead of expected stereo.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201250957.q0P9vYq2017256>