---

yaml
---
r: 119931
b: refs/heads/master
c: 24c0996
h: refs/heads/master
i:
  119929: 25a9dbf
  119927: 82a3af3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a9fafb89433c5fd1331bac0c84c4b321e358b42
+refs/heads/master: 24c0996a6b73e2554104961afcc8659534503e0d

trunk/drivers/usb/core/driver.c

@@ -279,7 +279,9 @@ static int usb_unbind_interface(struct device *dev)
 	 * altsetting means creating new endpoint device entries).
 	 * When either of these happens, defer the Set-Interface.
 	 */
-	if (!error && intf->dev.power.status == DPM_ON)
+	if (intf->cur_altsetting->desc.bAlternateSetting == 0)
+		;	/* Already in altsetting 0 so skip Set-Interface */
+	else if (!error && intf->dev.power.status == DPM_ON)
 		usb_set_interface(udev, intf->altsetting[0].
 				desc.bInterfaceNumber, 0);
 	else