diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:50 -0400 |
| commit | de745fb27983770ebfdeaa70f8a36f791fb33786 (patch) | |
| tree | 701555a1a7a2a5ff9a6c67896cf1ea089597750e /drivers/usb/core/message.c | |
| parent | 08cd84c81f27d5bd22ba958b7cae6d566c509280 (diff) | |
| parent | a670fcb43f01a67ef56176afc76e5d43d128b25c (diff) | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/usb/core/message.c')
| -rw-r--r-- | drivers/usb/core/message.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index a428ef479bd7..88d1b376f67c 100644 --- a/drivers/usb/core/message.c +++ b/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 @@ free_interfaces: } } - return ret; + return 0; } // synchronous request completion model |