USB: allow match on bInterfaceNumber

[firefly-linux-kernel-4.4.55.git] / drivers / usb / core / message.c

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index b548cf1dbc625c66181c1a6928c160fc597bc2e6..ca7fc392fd9e5e5a6930408ab8c0fd89c18eead7 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1559,7 +1559,7 @@ static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env)
 
        if (add_uevent_var(env,
                   "MODALIAS=usb:"
-                  "v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic%02Xisc%02Xip%02X",
+                  "v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic%02Xisc%02Xip%02Xin%02X",
                   le16_to_cpu(usb_dev->descriptor.idVendor),
                   le16_to_cpu(usb_dev->descriptor.idProduct),
                   le16_to_cpu(usb_dev->descriptor.bcdDevice),
@@ -1568,7 +1568,8 @@ static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env)
                   usb_dev->descriptor.bDeviceProtocol,
                   alt->desc.bInterfaceClass,
                   alt->desc.bInterfaceSubClass,
-                  alt->desc.bInterfaceProtocol))
+                  alt->desc.bInterfaceProtocol,
+                  alt->desc.bInterfaceNumber))
                return -ENOMEM;
 
        return 0;