Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4a75371 authored by Patrick Mochel's avatar Patrick Mochel Committed by Greg Kroah-Hartman
Browse files

[PATCH] Fix up USB to use klist_node_attached() instead of list_empty() on lists that will go away.



Signed-off-by: default avatarPatrick Mochel <mochel@digitalimplant.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>

Index: gregkh-2.6/drivers/usb/core/usb.c
===================================================================
parent 8b0c250b
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ int usb_driver_claim_interface(struct usb_driver *driver,
	/* if interface was already added, bind now; else let
	 * 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);

	return 0;
@@ -323,7 +323,7 @@ void usb_driver_release_interface(struct usb_driver *driver,
		return;

	/* 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);

	dev->driver = NULL;