From owner-svn-src-all@FreeBSD.ORG Wed May 21 06:33:22 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72CC8536; Wed, 21 May 2014 06:33:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EE6A2028; Wed, 21 May 2014 06:33:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4L6XMAn035347; Wed, 21 May 2014 06:33:22 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4L6XM6O035345; Wed, 21 May 2014 06:33:22 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201405210633.s4L6XM6O035345@svn.freebsd.org> From: Hans Petter Selasky Date: Wed, 21 May 2014 06:33:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r266487 - in stable/8/sys: dev/sound/usb modules/sound/driver/uaudio X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 06:33:22 -0000 Author: hselasky Date: Wed May 21 06:33:21 2014 New Revision: 266487 URL: http://svnweb.freebsd.org/changeset/base/266487 Log: MFC r266006 and r266011: Fix unload of USB audio kernel module. Modified: stable/8/sys/dev/sound/usb/uaudio.c stable/8/sys/modules/sound/driver/uaudio/Makefile Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/sound/ (props changed) stable/8/sys/dev/sound/usb/ (props changed) stable/8/sys/modules/ (props changed) Modified: stable/8/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/8/sys/dev/sound/usb/uaudio.c Wed May 21 06:31:44 2014 (r266486) +++ stable/8/sys/dev/sound/usb/uaudio.c Wed May 21 06:33:21 2014 (r266487) @@ -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/8/sys/modules/sound/driver/uaudio/Makefile ============================================================================== --- stable/8/sys/modules/sound/driver/uaudio/Makefile Wed May 21 06:31:44 2014 (r266486) +++ stable/8/sys/modules/sound/driver/uaudio/Makefile Wed May 21 06:33:21 2014 (r266487) @@ -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