summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorrobert <robert@FreeBSD.org>2002-06-24 15:28:47 +0000
committerrobert <robert@FreeBSD.org>2002-06-24 15:28:47 +0000
commitfcf509a309739f81379da3e12a817b78746521b8 (patch)
treee0a001a58a05b766f408a738eac41a25d1b1ff06 /sys
parent2c118c5fbb54255f62669f4b9782f73c2816e6ae (diff)
downloadFreeBSD-src-fcf509a309739f81379da3e12a817b78746521b8.zip
FreeBSD-src-fcf509a309739f81379da3e12a817b78746521b8.tar.gz
Enable mixer interrupts after the mixer is initialized,
otherwise we might get interrupts and are unable to handle them properly, which results in a page fault. PR: kern/39549 Submitted by: Gil Kloepfer <gil@arlut.utexas.edu>
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/sound/pci/maestro3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index 49486cb..b38b334 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -1172,6 +1172,8 @@ m3_pci_attach(device_t dev)
goto bad;
}
+ m3_enable_ints(sc);
+
if (pcm_register(dev, sc, M3_PCHANS, M3_RCHANS)) {
device_printf(dev, "pcm_register error\n");
goto bad;
@@ -1321,8 +1323,6 @@ m3_pci_resume(device_t dev)
/* [m3_assp_continue] */
m3_wr_1(sc, DSP_PORT_CONTROL_REG_B, reset_state | REGB_ENABLE_RESET);
- m3_enable_ints(sc);
-
m3_amp_enable(sc);
if (mixer_reinit(dev) == -1) {
OpenPOWER on IntegriCloud