svn commit: r214830 - head/sys/dev/usb

[Nick Hibma]

Author: n_hibma
Date: Fri Nov  5 08:30:16 2010
New Revision: 214830
URL: http://svn.freebsd.org/changeset/base/214830

Log:
  Bugfix: Move the 'at <location string' to the beginning of the attach
  notification. devd would stop evaluating at 'at' (not '<k>=<v>') and
  hence prevent 'port=X' (and 'bus=<"on" string>) from making it into the
  environment for the devd action.
  
  Reviewed by:	hselasky
  MFC after:	2 weeks

Modified:
  head/sys/dev/usb/usb_device.c

Modified: head/sys/dev/usb/usb_device.c
==============================================================================
--- head/sys/dev/usb/usb_device.c	Fri Nov  5 07:49:47 2010	(r214829)
+++ head/sys/dev/usb/usb_device.c	Fri Nov  5 08:30:16 2010	(r214830)
@@ -2426,14 +2426,13 @@ usb_notify_addq_compat(const char *type,
 #if USB_HAVE_UGEN
 	    "%s "
 #endif
+	    "at port=%u "
 	    "vendor=0x%04x "
 	    "product=0x%04x "
 	    "devclass=0x%02x "
 	    "devsubclass=0x%02x "
 	    "sernum=\"%s\" "
 	    "release=0x%04x "
-	    "at "
-	    "port=%u "
 #if USB_HAVE_UGEN
 	    "on %s\n"
 #endif
@@ -2442,13 +2441,13 @@ usb_notify_addq_compat(const char *type,
 #if USB_HAVE_UGEN
 	    udev->ugen_name,
 #endif
+	    udev->port_no,
 	    UGETW(udev->ddesc.idVendor),
 	    UGETW(udev->ddesc.idProduct),
 	    udev->ddesc.bDeviceClass,
 	    udev->ddesc.bDeviceSubClass,
 	    usb_get_serial(udev),
-	    UGETW(udev->ddesc.bcdDevice),
-	    udev->port_no
+	    UGETW(udev->ddesc.bcdDevice)
 #if USB_HAVE_UGEN
 	    , udev->parent_hub != NULL ?
 		udev->parent_hub->ugen_name :