From owner-svn-src-user@FreeBSD.ORG  Mon Sep 20 19:47:59 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3FA8F1065679;
	Mon, 20 Sep 2010 19:47:59 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F6038FC0C;
	Mon, 20 Sep 2010 19:47:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8KJlxjv065460;
	Mon, 20 Sep 2010 19:47:59 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8KJlxIh065458;
	Mon, 20 Sep 2010 19:47:59 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201009201947.o8KJlxIh065458@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Mon, 20 Sep 2010 19:47:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212928 - user/weongyo/usb/sys/dev/usb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Sep 2010 19:47:59 -0000

Author: weongyo
Date: Mon Sep 20 19:47:58 2010
New Revision: 212928
URL: http://svn.freebsd.org/changeset/base/212928

Log:
  usb_pc_common_mem_cb() would always be called with holding uptag->mtx
  lock.

Modified:
  user/weongyo/usb/sys/dev/usb/usb_busdma.c

Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_busdma.c	Mon Sep 20 19:42:52 2010	(r212927)
+++ user/weongyo/usb/sys/dev/usb/usb_busdma.c	Mon Sep 20 19:47:58 2010	(r212928)
@@ -422,6 +422,8 @@ usb_pc_common_mem_cb(void *arg, bus_dma_
 	pc = arg;
 	uptag = pc->tag_parent;
 
+	mtx_assert(uptag->mtx, MA_OWNED);
+
 	if (error)
 		goto done;
 
@@ -443,13 +445,11 @@ usb_pc_common_mem_cb(void *arg, bus_dma_
 	}
 #endif
 done:
-	mtx_lock(uptag->mtx);
 	uptag->dma_error = (error ? 1 : 0);
 	if (isload)
 		(uptag->func) (uptag);
 	if (needwakeup != 0)
 		cv_broadcast(uptag->cv);
-	mtx_unlock(uptag->mtx);
 }
 
 /*------------------------------------------------------------------------*