[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 <rkagan@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index c231b4bef314..25cf7e9eccfa 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -611,11 +611,10 @@ static int usb_hotplug (struct device *dev, char **envp, int num_envp,
 
                 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 @@ static int usb_hotplug (struct device *dev, char **envp, int num_envp,
         } 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))