diff options
| author | mav <mav@FreeBSD.org> | 2012-09-24 08:23:05 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2012-09-24 08:23:05 +0000 |
| commit | 4ace505c99a430ba5e8cfb71a213c9d9a605b1e0 (patch) | |
| tree | 4adee1ee0cc45b122f4fba77ee66fe2c137f19cc /sys/dev/sound/pci | |
| parent | fabac59d19a4620bc1cec762c86a95a07565a12e (diff) | |
| download | FreeBSD-src-4ace505c99a430ba5e8cfb71a213c9d9a605b1e0.zip FreeBSD-src-4ace505c99a430ba5e8cfb71a213c9d9a605b1e0.tar.gz | |
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.
Submitted by: Barbara <barbara.freebsd@gmail.com> (1)
MFC after: 3 days
Diffstat (limited to 'sys/dev/sound/pci')
| -rw-r--r-- | sys/dev/sound/pci/hda/hdaa.c | 4 |
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 3659f4b..3fc948b 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"); ); }; |
