Date: Mon, 24 Sep 2012 08:23:06 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r240884 - head/sys/dev/sound/pci/hda Message-ID: <201209240823.q8O8N6v0078728@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Sep 24 08:23:05 2012 New Revision: 240884 URL: http://svn.freebsd.org/changeset/base/240884 Log: 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 Modified: head/sys/dev/sound/pci/hda/hdaa.c Modified: head/sys/dev/sound/pci/hda/hdaa.c ============================================================================== --- head/sys/dev/sound/pci/hda/hdaa.c Mon Sep 24 06:42:20 2012 (r240883) +++ head/sys/dev/sound/pci/hda/hdaa.c Mon Sep 24 08:23:05 2012 (r240884) @@ -627,7 +627,7 @@ hdaa_sense_init(struct hdaa_devinfo *dev (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 *dev "Headphones redirection for " "association %d nid=%d using %s.\n", w->bindas, w->nid, - (poll != 0) ? "polling" : + (w->unsol < 0) ? "polling" : "unsolicited responses"); ); };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209240823.q8O8N6v0078728>