From 3068bdba98cbedaaeac6a5e182df9c26a06f7256 Mon Sep 17 00:00:00 2001
From: Guido van Rooij <guido@FreeBSD.org>
Date: Wed, 5 Dec 2001 10:36:32 +0000
Subject: [PATCH] Fix resume for HP Omnibook 500's.

MFC after:	1 week
---
 sys/dev/sound/pci/maestro3.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index fb3f34c9616..812fd911dcf 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) {