D60464.id189048.diff
No OneTemporary
Actions

Size

676 B

Referenced Files

None

Subscribers

None

D60464.id189048.diff
View Options

	diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
	--- a/sys/dev/sound/pci/maestro3.c
	+++ b/sys/dev/sound/pci/maestro3.c
	@@ -1122,6 +1122,12 @@
	uint8_t event;

	event = m3_rd_1(sc, HW_VOL_COUNTER_MASTER);
	+ /*
	+ * The mixer_hwvol_*() functions can end up taking sound(4)'s
	+ * channel lock, but m3_pchan_trigger() takes sc_lock with the
	+ * channel lock already held, which can cause a LOR.
	+ */
	+ M3_UNLOCK(sc);
	switch (event) {
	case 0x99:
	mixer_hwvol_mute(sc->dev);
	@@ -1137,6 +1143,7 @@
	default:
	device_printf(sc->dev, "Unknown HWVOL event\n");
	}
	+ M3_LOCK(sc);
	m3_wr_1(sc, HW_VOL_COUNTER_MASTER, 0x88);
	}