Merge 3.5-rc3 into usb-next

This lets us catch the USB fixes that went into 3.5-rc3 into this branch,
as we want them here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --combined drivers/usb/core/message.c
index ca7fc392fd9e5e5a6930408ab8c0fd89c18eead7,bdd1c6749d88a9206208a27f7cbd7d966ebeb386..8b9d669e37845a2fa08824fc04ee5ddcd966f037
--- 1/drivers/usb/core/message.c
--- 2/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@@ -1559,7 -1559,7 +1559,7 @@@ static int usb_if_uevent(struct device 
  
        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,8 -1568,7 +1568,8 @@@
                   usb_dev->descriptor.bDeviceProtocol,
                   alt->desc.bInterfaceClass,
                   alt->desc.bInterfaceSubClass,
 -                 alt->desc.bInterfaceProtocol))
 +                 alt->desc.bInterfaceProtocol,
 +                 alt->desc.bInterfaceNumber))
                return -ENOMEM;
  
        return 0;
@@@ -1839,7 -1838,6 +1839,6 @@@ free_interfaces
                intfc = cp->intf_cache[i];
                intf->altsetting = intfc->altsetting;
                intf->num_altsetting = intfc->num_altsetting;
-               intf->intf_assoc = find_iad(dev, cp, i);
                kref_get(&intfc->ref);
  
                alt = usb_altnum_to_altsetting(intf, 0);
@@@ -1852,6 -1850,8 +1851,8 @@@
                if (!alt)
                        alt = &intf->altsetting[0];
  
+               intf->intf_assoc =
+                       find_iad(dev, cp, alt->desc.bInterfaceNumber);
                intf->cur_altsetting = alt;
                usb_enable_interface(dev, intf, true);
                intf->dev.parent = &dev->dev;