From owner-svn-src-all@FreeBSD.ORG Sun Apr 5 18:19:11 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 693541065732; Sun, 5 Apr 2009 18:19:11 +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 6FD688FC0A; Sun, 5 Apr 2009 18:19: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 n35IJAOQ027546; Sun, 5 Apr 2009 18:19:10 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n35IJAgL027545; Sun, 5 Apr 2009 18:19:10 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200904051819.n35IJAgL027545@svn.freebsd.org> From: Andrew Thompson Date: Sun, 5 Apr 2009 18:19: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: r190726 - head/sys/dev/usb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2009 18:19:13 -0000 Author: thompsa Date: Sun Apr 5 18:19:10 2009 New Revision: 190726 URL: http://svn.freebsd.org/changeset/base/190726 Log: MFp4 //depot/projects/usb@159806 Properly name usb2_uref_location() so that it is not confused with usb2_unref_location() . Submitted by: Hans Petter Selasky Modified: head/sys/dev/usb/usb_dev.c Modified: head/sys/dev/usb/usb_dev.c ============================================================================== --- head/sys/dev/usb/usb_dev.c Sun Apr 5 18:19:00 2009 (r190725) +++ head/sys/dev/usb/usb_dev.c Sun Apr 5 18:19:10 2009 (r190726) @@ -89,7 +89,7 @@ static void usb2_loc_fill(struct usb2_fs 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 @@ error: } /*------------------------------------------------------------------------* - * 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 @@ error: * 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 @@ usb2_ioctl(struct cdev *dev, u_long cmd, 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; }