diff options
| author | mav <mav@FreeBSD.org> | 2012-01-25 09:57:34 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2012-01-25 09:57:34 +0000 |
| commit | 7f01534f9d36588e633ddeac498031aa80f2cb40 (patch) | |
| tree | 0aff539d6e678e1ba1e9efc7d3b5490a15d2352a | |
| parent | cf0bd26fe1d54a23d4ceabe71a54dd8000367d57 (diff) | |
| download | FreeBSD-src-7f01534f9d36588e633ddeac498031aa80f2cb40.zip FreeBSD-src-7f01534f9d36588e633ddeac498031aa80f2cb40.tar.gz | |
Fix word order in hdaa_subvendor_id() to match PCI (where it comes from),
broken at r230130. This should fix applying system-specific patches.
| -rw-r--r-- | sys/dev/sound/pci/hda/hdaa.h | 4 | ||||
| -rw-r--r-- | sys/dev/sound/pci/hda/hdaa_patches.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/sound/pci/hda/hdaa.h b/sys/dev/sound/pci/hda/hdaa.h index 2435d64..db2017d 100644 --- a/sys/dev/sound/pci/hda/hdaa.h +++ b/sys/dev/sound/pci/hda/hdaa.h @@ -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); diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index b20c339..cd03913 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -620,9 +620,9 @@ hdaa_patch_direct(struct hdaa_devinfo *devinfo) 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. |
