The patch below adjusts the MODALIAS generated by the usb hotplug
function to match the proposed change to scripts/mod/file2alias.c.

Please consider applying.
  Roman.

Signed-off-by: Roman Kagan <[EMAIL PROTECTED]>

 drivers/usb/core/usb.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

--- linux-2.6.12-rc2/drivers/usb/core/usb.c~    2005-04-08 16:58:14.000000000 
+0400
+++ linux-2.6.12-rc2/drivers/usb/core/usb.c     2005-04-19 11:17:53.000000000 
+0400
@@ -618,11 +618,10 @@ static int usb_hotplug (struct device *d
 
                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,
@@ -633,11 +632,10 @@ static int usb_hotplug (struct device *d
        } 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))


-------------------------------------------------------
This SF.Net email is sponsored by: New Crystal Reports XI.
Version 11 adds new functionality designed to reduce time involved in
creating, integrating, and deploying reporting solutions. Free runtime info,
new features, or free trial, at: http://www.businessobjects.com/devxi/728
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to