From owner-svn-src-all@FreeBSD.ORG  Wed Jun 18 22:09:33 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E2EE579E;
 Wed, 18 Jun 2014 22:09:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D024F25A8;
 Wed, 18 Jun 2014 22:09:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5IM9Xoi096954;
 Wed, 18 Jun 2014 22:09:33 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5IM9Xje096953;
 Wed, 18 Jun 2014 22:09:33 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <201406182209.s5IM9Xje096953@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Wed, 18 Jun 2014 22:09:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r267621 - stable/10/sys/dev/usb
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jun 2014 22:09:34 -0000

Author: n_hibma
Date: Wed Jun 18 22:09:33 2014
New Revision: 267621
URL: http://svnweb.freebsd.org/changeset/base/267621

Log:
  MFC r261270:
  
  Fix the ordering of the arguments to printf in
  uhub_child_location_string(). This produced bogus information in
  
          dev.<USB driver>.<id>.%location
  
  output from sysctl.

Modified:
  stable/10/sys/dev/usb/usb_hub.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/usb_hub.c
==============================================================================
--- stable/10/sys/dev/usb/usb_hub.c	Wed Jun 18 19:32:38 2014	(r267620)
+++ stable/10/sys/dev/usb/usb_hub.c	Wed Jun 18 22:09:33 2014	(r267621)
@@ -1625,8 +1625,9 @@ uhub_child_location_string(device_t pare
 		goto done;
 	}
 	snprintf(buf, buflen, "bus=%u hubaddr=%u port=%u devaddr=%u interface=%u",
+	    device_get_unit(res.udev->bus->bdev),
 	    (res.udev->parent_hub != NULL) ? res.udev->parent_hub->device_index : 0,
-	    res.portno, device_get_unit(res.udev->bus->bdev),
+	    res.portno,
 	    res.udev->device_index, res.iface_index);
 done:
 	mtx_unlock(&Giant);