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

Commit f70fa629 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

Driver core: Don't ignore error returns from probing 



This patch (as797) fixes device_add() in the driver core.  It needs to
pay attention when the driver for a new device reports an error.

At the same time, since bus_remove_device() undoes the effects of both
bus_add_device() and bus_attach_device(), it needs to check whether
the bus_attach_device step failed.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 952ab431

drivers/base/bus.c

+4 −2
Original line number Diff line number Diff line
@@ -439,8 +439,10 @@ void bus_remove_device(struct device * dev) 
		sysfs_remove_link(&dev->kobj, "bus");

		sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id);

		device_remove_attrs(dev->bus, dev);

		if (dev->is_registered) {

			dev->is_registered = 0;

			klist_del(&dev->knode_bus);

		}

		pr_debug("bus %s: remove device %s\n", dev->bus->name, dev->bus_id);

		device_release_driver(dev);

		put_bus(dev->bus);

drivers/base/core.c

+4 −1
Original line number Diff line number Diff line
@@ -479,7 +479,8 @@ int device_add(struct device *dev) 
	if ((error = bus_add_device(dev)))

		goto BusError;

	kobject_uevent(&dev->kobj, KOBJ_ADD);

	bus_attach_device(dev);

	if ((error = bus_attach_device(dev)))

		goto AttachError;

	if (parent)

		klist_add_tail(&dev->knode_parent, &parent->klist_children);
@@ -498,6 +499,8 @@ int device_add(struct device *dev) 
 	kfree(class_name);

	put_device(dev);

	return error;

 AttachError:

	bus_remove_device(dev);

 BusError:

	device_pm_remove(dev);

 PMError: