From owner-p4-projects@FreeBSD.ORG  Wed Mar 25 15:18:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1C2FB106579E; Wed, 25 Mar 2009 15:18:39 +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 B2E681065789
	for <perforce@FreeBSD.org>; Wed, 25 Mar 2009 15:18:38 +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 9ED688FC1F
	for <perforce@FreeBSD.org>; Wed, 25 Mar 2009 15:18:38 +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 n2PFIctt067961
	for <perforce@FreeBSD.org>; Wed, 25 Mar 2009 15:18:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2PFIc7Z067959
	for perforce@freebsd.org; Wed, 25 Mar 2009 15:18:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 25 Mar 2009 15:18:38 GMT
Message-Id: <200903251518.n2PFIc7Z067959@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 159806 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: Wed, 25 Mar 2009 15:18:42 -0000

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

Change 159806 by hselasky@hselasky_laptop001 on 2009/03/25 15:18:28

	
	USB core:
	- properly name usb2_uref_location() so that it is not
	  confused with usb2_unref_location() .

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#15 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#15 (text+ko) ====

@@ -89,7 +89,7 @@
 		    struct usb2_cdev_privdata *);
 static void	usb2_close(void *);
 static usb2_error_t usb2_ref_device(struct usb2_cdev_privdata *, int);
-static usb2_error_t usb2_uref_location(struct usb2_cdev_privdata *);
+static usb2_error_t usb2_usb_ref_location(struct usb2_cdev_privdata *);
 static void	usb2_unref_device(struct usb2_cdev_privdata *);
 
 static d_open_t usb2_open;
@@ -264,7 +264,7 @@
 }
 
 /*------------------------------------------------------------------------*
- *	usb2_uref_location
+ *	usb2_usb_ref_location
  *
  * This function is used to upgrade an USB reference to include the
  * USB device reference on a USB location.
@@ -274,7 +274,7 @@
  *  Else: Failure.
  *------------------------------------------------------------------------*/
 static usb2_error_t
-usb2_uref_location(struct usb2_cdev_privdata *cpd)
+usb2_usb_ref_location(struct usb2_cdev_privdata *cpd)
 {
 	/*
 	 * Check if we already got an USB reference on this location:
@@ -1038,7 +1038,7 @@
 		err = (f->methods->f_ioctl) (f, cmd, addr, fflags);
 		DPRINTFN(2, "f_ioctl cmd 0x%lx = %d\n", cmd, err);
 		if (err == ENOIOCTL) {
-			if (usb2_uref_location(cpd)) {
+			if (usb2_usb_ref_location(cpd)) {
 				err = ENXIO;
 				goto done;
 			}