diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-05-21 06:29:52 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-05-21 06:29:52 +0000 |
| commit | b658133ca6cb475fab58dfef2ae77ff6522e17e4 (patch) | |
| tree | 157fbf1793badc0d903ddc6e9bb068953fdace29 | |
| parent | ba3f74daf2a9ea63e9cb9203c10f73482606e4f1 (diff) | |
| download | FreeBSD-src-b658133ca6cb475fab58dfef2ae77ff6522e17e4.zip FreeBSD-src-b658133ca6cb475fab58dfef2ae77ff6522e17e4.tar.gz | |
MFC r266006 and r266011:
Fix unload of USB audio kernel module.
| -rw-r--r-- | sys/dev/sound/usb/uaudio.c | 2 | ||||
| -rw-r--r-- | sys/modules/sound/driver/uaudio/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 33ff274..1af8cb2 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -5917,7 +5917,7 @@ uaudio_hid_detach(struct uaudio_softc *sc) usbd_transfer_unsetup(sc->sc_hid.xfer, UAUDIO_HID_N_TRANSFER); } -DRIVER_MODULE(uaudio, uhub, uaudio_driver, uaudio_devclass, NULL, 0); +DRIVER_MODULE_ORDERED(uaudio, uhub, uaudio_driver, uaudio_devclass, NULL, 0, SI_ORDER_ANY); MODULE_DEPEND(uaudio, usb, 1, 1, 1); MODULE_DEPEND(uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(uaudio, 1); diff --git a/sys/modules/sound/driver/uaudio/Makefile b/sys/modules/sound/driver/uaudio/Makefile index 7fa025a..1dd4493 100644 --- a/sys/modules/sound/driver/uaudio/Makefile +++ b/sys/modules/sound/driver/uaudio/Makefile @@ -7,6 +7,6 @@ S= ${.CURDIR}/../../../.. KMOD= snd_uaudio SRCS= bus_if.h device_if.h usb_if.h vnode_if.h SRCS+= opt_usb.h opt_bus.h feeder_if.h channel_if.h usbdevs.h -SRCS+= uaudio.c uaudio_pcm.c +SRCS+= uaudio_pcm.c uaudio.c .include <bsd.kmod.mk> |
