commit fb3b4ebc0be618dbcc2326482a83c920d51af7de
tree e0b4c9bc6eacf08028041e3f7c25adb3e9638a00
parent b19dcd9341a81ff6e04fcec396f77eeb91570584
author Roman Kagan <[EMAIL PROTECTED]> 1114207621 -0700
committer Greg KH <[EMAIL PROTECTED]> 1114207621 -0700
[PATCH] USB: MODALIAS change for bcdDevice
The patch below adjusts the MODALIAS generated by the usb hotplug
function to match the proposed change to scripts/mod/file2alias.c.
Signed-off-by: Roman Kagan <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
Index: drivers/usb/core/usb.c
===================================================================
--- f2eebbf7142d5d36ffb44d365ad3eca539ff5127/drivers/usb/core/usb.c
(mode:100644 sha1:c231b4bef314284a168fedb6c5f6c47aec5084fc)
+++ e0b4c9bc6eacf08028041e3f7c25adb3e9638a00/drivers/usb/core/usb.c
(mode:100644 sha1:25cf7e9eccfaadab58c4eb596494cec910cfbdbb)
@@ -611,11 +611,10 @@
if (add_hotplug_env_var(envp, num_envp, &i,
buffer, buffer_size, &length,
-
"MODALIAS=usb:v%04Xp%04Xdl%04Xdh%04Xdc%02Xdsc%02Xdp%02Xic%02Xisc%02Xip%02X",
+
"MODALIAS=usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic%02Xisc%02Xip%02X",
le16_to_cpu(usb_dev->descriptor.idVendor),
le16_to_cpu(usb_dev->descriptor.idProduct),
le16_to_cpu(usb_dev->descriptor.bcdDevice),
-
le16_to_cpu(usb_dev->descriptor.bcdDevice),
usb_dev->descriptor.bDeviceClass,
usb_dev->descriptor.bDeviceSubClass,
usb_dev->descriptor.bDeviceProtocol,
@@ -626,11 +625,10 @@
} else {
if (add_hotplug_env_var(envp, num_envp, &i,
buffer, buffer_size, &length,
-
"MODALIAS=usb:v%04Xp%04Xdl%04Xdh%04Xdc%02Xdsc%02Xdp%02Xic*isc*ip*",
+
"MODALIAS=usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic*isc*ip*",
le16_to_cpu(usb_dev->descriptor.idVendor),
le16_to_cpu(usb_dev->descriptor.idProduct),
le16_to_cpu(usb_dev->descriptor.bcdDevice),
-
le16_to_cpu(usb_dev->descriptor.bcdDevice),
usb_dev->descriptor.bDeviceClass,
usb_dev->descriptor.bDeviceSubClass,
usb_dev->descriptor.bDeviceProtocol))
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_ide95&alloc_id396&op=click
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
