Commit 29591b92 authored Apr 22, 2008 by Rafael J. Wysocki Committed by Linus Torvalds Apr 22, 2008

bus_remove_device: be more careful about incomplete initialization



Prevent bus_remove_device() from crashing if dev->knode_bus has not been
initialized before it's called.

This can happen if the device_add() ended up breaking out early due to
an error, for example.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 08119e89

drivers/base/bus.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -530,6 +530,7 @@ void bus_remove_device(struct device *dev)
	sysfs_remove_link(&dev->bus->p->devices_kset->kobj,		sysfs_remove_link(&dev->bus->p->devices_kset->kobj,
	dev->bus_id);		dev->bus_id);
	device_remove_attrs(dev->bus, dev);		device_remove_attrs(dev->bus, dev);
			if (klist_node_attached(&dev->knode_bus))
	klist_del(&dev->knode_bus);		klist_del(&dev->knode_bus);

	pr_debug("bus: '%s': remove device %s\n",		pr_debug("bus: '%s': remove device %s\n",