aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/sound/pci/hda/hdaa_patches.c
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2012-07-02 18:35:08 +0000
committerAlexander Motin <mav@FreeBSD.org>2012-07-02 18:35:08 +0000
commit3c461fd01bc8e8925d88d4ead80f5540f428ec7e (patch)
tree207b68894c26efc764743d1a06935b5ea7cbe7c1 /sys/dev/sound/pci/hda/hdaa_patches.c
parentf2ed28480d8ccf874de1bc275b34983575278c66 (diff)
downloadsrc-3c461fd01bc8e8925d88d4ead80f5540f428ec7e.tar.gz
src-3c461fd01bc8e8925d88d4ead80f5540f428ec7e.zip
Restore GPIO config quirks handling, lost during last big refactoring.
Tested by: hselasky MFC after: 3 days
Notes
Notes: svn path=/head/; revision=238011
Diffstat (limited to 'sys/dev/sound/pci/hda/hdaa_patches.c')
-rw-r--r--sys/dev/sound/pci/hda/hdaa_patches.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c
index cd03913ca7e1..86330391970a 100644
--- a/sys/dev/sound/pci/hda/hdaa_patches.c
+++ b/sys/dev/sound/pci/hda/hdaa_patches.c
@@ -401,12 +401,9 @@ hdaa_patch(struct hdaa_devinfo *devinfo)
if (!(HDA_DEV_MATCH(hdac_quirks[i].model, subid) &&
HDA_DEV_MATCH(hdac_quirks[i].id, id)))
continue;
- if (hdac_quirks[i].set != 0)
- devinfo->quirks |=
- hdac_quirks[i].set;
- if (hdac_quirks[i].unset != 0)
- devinfo->quirks &=
- ~(hdac_quirks[i].unset);
+ devinfo->quirks |= hdac_quirks[i].set;
+ devinfo->quirks &= ~(hdac_quirks[i].unset);
+ devinfo->gpio = hdac_quirks[i].gpio;
}
/* Apply per-widget patch. */