svn commit: r236755 - stable/8/sys/dev/sound/pci/hda
Alexander Motin
mav at FreeBSD.org
Fri Jun 8 13:25:47 UTC 2012
Author: mav
Date: Fri Jun 8 13:25:46 2012
New Revision: 236755
URL: http://svn.freebsd.org/changeset/base/236755
Log:
MFC r233606:
Stop HDA controller polling callout on suspend and reset it on resume.
Modified:
stable/8/sys/dev/sound/pci/hda/hdac.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- stable/8/sys/dev/sound/pci/hda/hdac.c Fri Jun 8 13:22:50 2012 (r236754)
+++ stable/8/sys/dev/sound/pci/hda/hdac.c Fri Jun 8 13:25:46 2012 (r236755)
@@ -1558,8 +1558,10 @@ hdac_suspend(device_t dev)
HDA_BOOTHVERBOSE(
device_printf(dev, "Reset controller...\n");
);
+ callout_stop(&sc->poll_callout);
hdac_reset(sc, 0);
hdac_unlock(sc);
+ callout_drain(&sc->poll_callout);
taskqueue_drain(taskqueue_thread, &sc->unsolq_task);
HDA_BOOTHVERBOSE(
device_printf(dev, "Suspend done\n");
@@ -1608,6 +1610,7 @@ hdac_resume(device_t dev)
HDAC_GCTL_UNSOL);
HDAC_WRITE_4(&sc->mem, HDAC_INTCTL, HDAC_INTCTL_CIE | HDAC_INTCTL_GIE);
DELAY(1000);
+ hdac_poll_reinit(sc);
hdac_unlock(sc);
error = bus_generic_resume(dev);
More information about the svn-src-all
mailing list