---

yaml --- r: 5483 b: refs/heads/master c: 86d3074 h: refs/heads/master i: 5481: 702f10a 5479: 1bd47f7 v: v3
git-mirror · Jul 29, 2005 · c230d18 · c230d18
1 parent c08a8ee
commit c230d18
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a0d73c463765ce34b22ac3924d0661caf2a7539
+refs/heads/master: 86d30741e480f40676c2173e1153368a4846da48
diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c
@@ -985,8 +985,10 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
 		for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) {
 			struct usb_interface	*interface;
 
-			/* remove this interface */
+			/* remove this interface if it has been registered */
 			interface = dev->actconfig->interface[i];
+			if (!klist_node_attached(&interface->dev.knode_bus))
+				continue;
 			dev_dbg (&dev->dev, "unregistering interface %s\n",
 				interface->dev.bus_id);
 			usb_remove_sysfs_intf_files(interface);
@@ -1439,7 +1441,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
 		}
 	}
 
-	return ret;
+	return 0;
 }
 
 // synchronous request completion model