From 3929b23174183def148983ef5ae56b4328f60db7 Mon Sep 17 00:00:00 2001 From: hselasky Date: Wed, 21 May 2014 06:31:44 +0000 Subject: [PATCH] MFC r266006 and r266011: Fix unload of USB audio kernel module. git-svn-id: svn://svn.freebsd.org/base/stable/9@266486 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/sound/usb/uaudio.c | 2 +- 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 33ff2746f..1af8cb2c4 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 7fa025a58..1dd449315 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 -- 2.45.0