summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorguido <guido@FreeBSD.org>2001-12-05 10:36:32 +0000
committerguido <guido@FreeBSD.org>2001-12-05 10:36:32 +0000
commit19c1d909f1e9b7006d1c93609da63bf8c2d4e892 (patch)
tree39789fdcd601498f0dc729978390bbad32b22598 /sys
parent4133536ce19bd88aa34ce4e2a9de5de955700eeb (diff)
downloadFreeBSD-src-19c1d909f1e9b7006d1c93609da63bf8c2d4e892.zip
FreeBSD-src-19c1d909f1e9b7006d1c93609da63bf8c2d4e892.tar.gz
Fix resume for HP Omnibook 500's.
MFC after: 1 week
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/sound/pci/maestro3.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index fb3f34c..812fd91 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -1307,6 +1307,8 @@ m3_pci_resume(device_t dev)
reset_state = m3_assp_halt(sc);
+ m3_codec_reset(sc);
+
/* Restore the ASSP state */
for (i = REV_B_CODE_MEMORY_BEGIN; i <= REV_B_CODE_MEMORY_END; i++)
m3_wr_assp_code(sc, i, sc->savemem[++index]);
@@ -1323,6 +1325,11 @@ m3_pci_resume(device_t dev)
m3_amp_enable(sc);
+ if (mixer_reinit(dev) == -1) {
+ device_printf(dev, "unable to reinitialize the mixer\n");
+ return ENXIO;
+ }
+
/* Turn the channels back on */
for (i=0 ; i<sc->pch_cnt ; i++) {
if (sc->pch[i].active) {
OpenPOWER on IntegriCloud