From cef840e09e575105868cea5b7e039a17ba68025d Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 12 Jun 2012 20:23:52 +0200 Subject: [PATCH] --- yaml --- r: 310922 b: refs/heads/master c: b3a3dd074f7053ef824ad077e5331b52220ceba1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/message.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b41348d95e69..610d1ab3374c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5897b038296ea84e501ba5f957e11939f8cf9be0 +refs/heads/master: b3a3dd074f7053ef824ad077e5331b52220ceba1 diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index b548cf1dbc62..bdd1c6749d88 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/drivers/usb/core/message.c @@ -1838,7 +1838,6 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 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); @@ -1851,6 +1850,8 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 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;