aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2012-09-27 08:24:34 +0000
committerAlexander Motin <mav@FreeBSD.org>2012-09-27 08:24:34 +0000
commitbc9a3f6771a4df101317a287b7dc7695711d7632 (patch)
tree3741a1a8ddd90f86bb13344056dd73028b38bb1b
parent1271043562eb00f9aa6fa3d556bd98828c389ea3 (diff)
downloadsrc-bc9a3f6771a4df101317a287b7dc7695711d7632.tar.gz
src-bc9a3f6771a4df101317a287b7dc7695711d7632.zip
MFC r240884:
Fix panic caused by wrong pointer dereference, left after pin sense rewrite at r230551. Also while there, make sense polling use reported for each node separately instead of reporting accumulated total status. Approved by: re (kib)
Notes
Notes: svn path=/releng/9.1/; revision=240988
-rw-r--r--sys/dev/sound/pci/hda/hdaa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
index 169adc6968dd..7cad882ac61d 100644
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -627,7 +627,7 @@ hdaa_sense_init(struct hdaa_devinfo *devinfo)
(HDA_CONFIG_DEFAULTCONF_MISC(w->wclass.pin.config) & 1) != 0) {
device_printf(devinfo->dev,
"No presence detection support at nid %d\n",
- as[i].pins[15]);
+ w->nid);
} else {
if (w->unsol < 0)
poll = 1;
@@ -636,7 +636,7 @@ hdaa_sense_init(struct hdaa_devinfo *devinfo)
"Headphones redirection for "
"association %d nid=%d using %s.\n",
w->bindas, w->nid,
- (poll != 0) ? "polling" :
+ (w->unsol < 0) ? "polling" :
"unsolicited responses");
);
};