svn commit: r267621 - stable/10/sys/dev/usb

[Nick Hibma]

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);