From a6fddf3306d86666d9f93f9d0a986ca4d19c598f Mon Sep 17 00:00:00 2001
From: n_hibma <n_hibma@FreeBSD.org>
Date: Fri, 5 Nov 2010 08:30:16 +0000
Subject: 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
---
 sys/dev/usb/usb_device.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'sys/dev/usb')

diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index 63925e2..95b0e9e 100644
--- a/sys/dev/usb/usb_device.c
+++ b/sys/dev/usb/usb_device.c
@@ -2426,14 +2426,13 @@ usb_notify_addq_compat(const char *type, struct usb_device *udev)
 #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, struct usb_device *udev)
 #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 :
-- 
cgit v1.1