aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2012-01-25 09:57:34 +0000
committerAlexander Motin <mav@FreeBSD.org>2012-01-25 09:57:34 +0000
commit89a8fedd7774fbb840ebda33ddb418ea4eb3bfc4 (patch)
tree0aff539d6e678e1ba1e9efc7d3b5490a15d2352a
parent8e4609a4a3201076c785435d80e425197f549c30 (diff)
downloadsrc-89a8fedd7774fbb840ebda33ddb418ea4eb3bfc4.tar.gz
src-89a8fedd7774fbb840ebda33ddb418ea4eb3bfc4.zip
Fix word order in hdaa_subvendor_id() to match PCI (where it comes from),
broken at r230130. This should fix applying system-specific patches.
Notes
Notes: svn path=/head/; revision=230532
-rw-r--r--sys/dev/sound/pci/hda/hdaa.h4
-rw-r--r--sys/dev/sound/pci/hda/hdaa_patches.c6
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 2435d64887a2..db2017d499dd 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 b20c3390b667..cd03913ca7e1 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.