From owner-svn-src-all@FreeBSD.ORG Wed May 14 07:33:06 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8E521D4; Wed, 14 May 2014 07:33:06 +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 95F342376; Wed, 14 May 2014 07:33:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4E7X6oQ080639; Wed, 14 May 2014 07:33:06 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4E7X6Ux080638; Wed, 14 May 2014 07:33:06 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201405140733.s4E7X6Ux080638@svn.freebsd.org> From: Hans Petter Selasky Date: Wed, 14 May 2014 07:33:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266006 - head/sys/modules/sound/driver/uaudio X-SVN-Group: head 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, 14 May 2014 07:33:06 -0000 Author: hselasky Date: Wed May 14 07:33:06 2014 New Revision: 266006 URL: http://svnweb.freebsd.org/changeset/base/266006 Log: Change the USB audio kernel module linking order, so that the USB audio device driver is detached first and not its children. This fixes a panic in some cases when unloading "snd_uaudio" while a USB device is plugged. The linking order affects the order in which the module dependencies are registered. MFC after: 1 week Modified: head/sys/modules/sound/driver/uaudio/Makefile Modified: head/sys/modules/sound/driver/uaudio/Makefile ============================================================================== --- head/sys/modules/sound/driver/uaudio/Makefile Wed May 14 04:57:55 2014 (r266005) +++ head/sys/modules/sound/driver/uaudio/Makefile Wed May 14 07:33:06 2014 (r266006) @@ -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