svn commit: r266485 - in stable/10/sys: dev/sound/usb modules/sound/driver/uaudio

[Hans Petter Selasky]

Author: hselasky
Date: Wed May 21 06:29:52 2014
New Revision: 266485
URL: http://svnweb.freebsd.org/changeset/base/266485

Log:
  MFC r266006 and r266011:
  Fix unload of USB audio kernel module.

Modified:
  stable/10/sys/dev/sound/usb/uaudio.c
  stable/10/sys/modules/sound/driver/uaudio/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sound/usb/uaudio.c
==============================================================================
--- stable/10/sys/dev/sound/usb/uaudio.c	Wed May 21 06:23:52 2014	(r266484)
+++ stable/10/sys/dev/sound/usb/uaudio.c	Wed May 21 06:29:52 2014	(r266485)
@@ -5917,7 +5917,7 @@ uaudio_hid_detach(struct uaudio_softc *s
 	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);

Modified: stable/10/sys/modules/sound/driver/uaudio/Makefile
==============================================================================
--- stable/10/sys/modules/sound/driver/uaudio/Makefile	Wed May 21 06:23:52 2014	(r266484)
+++ stable/10/sys/modules/sound/driver/uaudio/Makefile	Wed May 21 06:29:52 2014	(r266485)
@@ -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>