[PATCH] Fix up USB to use klist_node_attached() instead of list_empty() on lists that will go away.
Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Index: gregkh-2.6/drivers/usb/core/usb.c ===================================================================
This commit is contained in:
parent
8b0c250be4
commit
d4a7537122
@ -293,7 +293,7 @@ int usb_driver_claim_interface(struct usb_driver *driver,
|
|||||||
/* if interface was already added, bind now; else let
|
/* if interface was already added, bind now; else let
|
||||||
* the future device_add() bind it, bypassing probe()
|
* the future device_add() bind it, bypassing probe()
|
||||||
*/
|
*/
|
||||||
if (!list_empty (&dev->bus_list))
|
if (!klist_node_attached (&dev->knode_bus))
|
||||||
device_bind_driver(dev);
|
device_bind_driver(dev);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@ -323,7 +323,7 @@ void usb_driver_release_interface(struct usb_driver *driver,
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
/* don't disconnect from disconnect(), or before dev_add() */
|
/* don't disconnect from disconnect(), or before dev_add() */
|
||||||
if (!list_empty (&dev->driver_list) && !list_empty (&dev->bus_list))
|
if (!klist_node_attached(&dev->knode_driver) && !klist_node_attached(&dev->knode_bus))
|
||||||
device_release_driver(dev);
|
device_release_driver(dev);
|
||||||
|
|
||||||
dev->driver = NULL;
|
dev->driver = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user