From owner-svn-src-head@FreeBSD.ORG  Mon Nov 10 23:18:10 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 790931065674;
	Mon, 10 Nov 2008 23:18:10 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6909B8FC0A;
	Mon, 10 Nov 2008 23:18:10 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAANIAQb084973;
	Mon, 10 Nov 2008 23:18:10 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAANIAlH084972;
	Mon, 10 Nov 2008 23:18:10 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200811102318.mAANIAlH084972@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Mon, 10 Nov 2008 23:18:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184827 - head/sys/dev/usb2/controller
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Nov 2008 23:18:10 -0000

Author: thompsa
Date: Mon Nov 10 23:18:10 2008
New Revision: 184827
URL: http://svn.freebsd.org/changeset/base/184827

Log:
  Add missing USB_BUS_LOCK* change from r184824.

Modified:
  head/sys/dev/usb2/controller/musb2_otg.c

Modified: head/sys/dev/usb2/controller/musb2_otg.c
==============================================================================
--- head/sys/dev/usb2/controller/musb2_otg.c	Mon Nov 10 22:40:16 2008	(r184826)
+++ head/sys/dev/usb2/controller/musb2_otg.c	Mon Nov 10 23:18:10 2008	(r184827)
@@ -1493,7 +1493,7 @@ done:
 static void
 musbotg_device_done(struct usb2_xfer *xfer, usb2_error_t error)
 {
-	mtx_assert(xfer->usb2_mtx, MA_OWNED);
+	USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
 
 	DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n",
 	    xfer, xfer->pipe, error);