D50393.id160960.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50393.id160960.diff
View Options

	diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
	--- a/sys/dev/sound/pci/hda/hdac.c
	+++ b/sys/dev/sound/pci/hda/hdac.c
	@@ -1773,17 +1773,17 @@
	struct hdac_softc *sc = device_get_softc(dev);
	int i, error;

	+ callout_drain(&sc->poll_callout);
	+ hdac_irq_free(sc);
	+ taskqueue_drain(taskqueue_thread, &sc->unsolq_task);
	+
	error = bus_generic_detach(dev);
	if (error != 0)
	return (error);

	hdac_lock(sc);
	- callout_stop(&sc->poll_callout);
	hdac_reset(sc, false);
	hdac_unlock(sc);
	- callout_drain(&sc->poll_callout);
	- taskqueue_drain(taskqueue_thread, &sc->unsolq_task);
	- hdac_irq_free(sc);

	for (i = 0; i < sc->num_ss; i++)
	hdac_dma_free(sc, &sc->streams[i].bdl);
	@@ -2206,4 +2206,4 @@
	sizeof(struct hdac_softc),
	};

	-DRIVER_MODULE(snd_hda, pci, hdac_driver, NULL, NULL);
	+DRIVER_MODULE_ORDERED(snd_hda, pci, hdac_driver, NULL, NULL, SI_ORDER_ANY);
	diff --git a/sys/modules/sound/driver/hda/Makefile b/sys/modules/sound/driver/hda/Makefile
	--- a/sys/modules/sound/driver/hda/Makefile
	+++ b/sys/modules/sound/driver/hda/Makefile
	@@ -2,7 +2,7 @@

	KMOD= snd_hda
	SRCS= device_if.h bus_if.h pci_if.h channel_if.h mixer_if.h hdac_if.h
	-SRCS+= hdaa.c hdaa.h hdaa_patches.c hdac.c hdac_if.h hdac_if.c
	-SRCS+= hdacc.c hdac_private.h hdac_reg.h hda_reg.h hdac.h
	+SRCS+= hdaa.c hdaa.h hdaa_patches.c hdacc.c hdac.c hdac_if.c
	+SRCS+= hdac_private.h hdac_reg.h hda_reg.h hdac.h

	.include <bsd.kmod.mk>