From owner-svn-src-head@FreeBSD.ORG  Mon Feb  9 22:06:52 2009
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 CC46D106564A;
	Mon,  9 Feb 2009 22:06:52 +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 BA46D8FC24;
	Mon,  9 Feb 2009 22:06:52 +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 n19M6qgx072671;
	Mon, 9 Feb 2009 22:06:52 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n19M6qu1072670;
	Mon, 9 Feb 2009 22:06:52 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200902092206.n19M6qu1072670@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Mon, 9 Feb 2009 22:06:52 +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: r188414 - head/sys/dev/usb2/misc
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, 09 Feb 2009 22:06:53 -0000

Author: thompsa
Date: Mon Feb  9 22:06:52 2009
New Revision: 188414
URL: http://svn.freebsd.org/changeset/base/188414

Log:
  MFp4 //depot/projects/usb; 157069
  
   - Change "usb2_pause_mtx" so that it takes the timeout value in ticks
  
  Submitted by:	Hans Petter Selasky

Modified:
  head/sys/dev/usb2/misc/ufm2.c

Modified: head/sys/dev/usb2/misc/ufm2.c
==============================================================================
--- head/sys/dev/usb2/misc/ufm2.c	Mon Feb  9 22:05:25 2009	(r188413)
+++ head/sys/dev/usb2/misc/ufm2.c	Mon Feb  9 22:06:52 2009	(r188414)
@@ -288,10 +288,7 @@ ufm_get_stat(struct ufm_softc *sc, void 
 	 * Note, there's a 240ms settle time before the status
 	 * will be valid, so sleep that amount.
 	 */
-
-	mtx_lock(&sc->sc_mtx);
-	usb2_pause_mtx(&sc->sc_mtx, USB_MS_HZ / 4);
-	mtx_unlock(&sc->sc_mtx);
+	usb2_pause_mtx(NULL, hz / 4);
 
 	if (ufm_do_req(sc, UFM_CMD0,
 	    0x00, 0x24, &ret)) {