From 2dec07e92c4f6e69a25b2783e73c52e95a83a379 Mon Sep 17 00:00:00 2001 From: mav Date: Thu, 27 Sep 2012 08:24:34 +0000 Subject: [PATCH] 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) git-svn-id: svn://svn.freebsd.org/base/releng/9.1@240988 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/sound/pci/hda/hdaa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index 169adc69..7cad882a 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"); ); }; -- 2.42.0