From owner-p4-projects@FreeBSD.ORG  Sat Sep 20 12:58:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9BB42106567D; Sat, 20 Sep 2008 12:58:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5F7841065679
	for <perforce@FreeBSD.org>; Sat, 20 Sep 2008 12:58:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 48FE08FC1F
	for <perforce@FreeBSD.org>; Sat, 20 Sep 2008 12:58:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8KCwHW2008368
	for <perforce@FreeBSD.org>; Sat, 20 Sep 2008 12:58:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8KCwHXw008362
	for perforce@freebsd.org; Sat, 20 Sep 2008 12:58:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 20 Sep 2008 12:58:17 GMT
Message-Id: <200809201258.m8KCwHXw008362@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 150166 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Sep 2008 12:58:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=150166

Change 150166 by hselasky@hselasky_laptop001 on 2008/09/20 12:58:11

	
	Fix incorrect locking. The code path where the incorrect 
	locking exists is currently not used.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#6 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#6 (text+ko) ====

@@ -614,7 +614,6 @@
 			/*
 			 * Try to load memory into DMA.
 			 */
-			mtx_lock(uptag->mtx);
 			err = bus_dmamap_load(
 			    pc->tag, pc->map, pc->buffer, size,
 			    &usb2_pc_alloc_mem_cb, pc, BUS_DMA_WAITOK);
@@ -622,8 +621,6 @@
 				usb2_cv_wait(uptag->cv, uptag->mtx);
 				err = 0;
 			}
-			mtx_unlock(uptag->mtx);
-
 			if (err || uptag->dma_error) {
 				return (1);
 			}