The patch titled
driver core: bus_attach_device() retval check
has been removed from the -mm tree. Its filename is
driver-core-bus_attach_device-retval-check.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: driver core: bus_attach_device() retval check
From: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Check for return value of bus_attach_device() in device_add(). Add a
function bus_delete_device() that undos the effects of bus_add_device().
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/base/base.h | 1 +
drivers/base/bus.c | 21 ++++++++++++++++++++-
drivers/base/core.c | 6 +++++-
3 files changed, 26 insertions(+), 2 deletions(-)
diff -puN drivers/base/base.h~driver-core-bus_attach_device-retval-check drivers/base/base.h
--- a/drivers/base/base.h~driver-core-bus_attach_device-retval-check
+++ a/drivers/base/base.h
@@ -17,6 +17,7 @@ extern int attribute_container_init(void
extern int bus_add_device(struct device * dev);
extern int bus_attach_device(struct device * dev);
+extern void bus_delete_device(struct device * dev);
extern void bus_remove_device(struct device * dev);
extern struct bus_type *get_bus(struct bus_type * bus);
extern void put_bus(struct bus_type * bus);
diff -puN drivers/base/bus.c~driver-core-bus_attach_device-retval-check drivers/base/bus.c
--- a/drivers/base/bus.c~driver-core-bus_attach_device-retval-check
+++ a/drivers/base/bus.c
@@ -360,7 +360,7 @@ static void device_remove_attrs(struct b
* bus_add_device - add device to bus
* @dev: device being added
*
- * - Add the device to its bus's list of devices.
+ * - Add attributes.
* - Create link to device's bus.
*/
int bus_add_device(struct device * dev)
@@ -424,6 +424,25 @@ int bus_attach_device(struct device * de
}
/**
+ * bus_delete_device - undo bus_add_device
+ * @dev: device being deleted
+ *
+ * - Remove symlink from bus's directory.
+ * - Remove attributes.
+ * - Drop reference taken in bus_add_device().
+ */
+void bus_delete_device(struct device * dev)
+{
+ if (dev->bus) {
+ sysfs_remove_link(&dev->kobj, "subsystem");
+ sysfs_remove_link(&dev->kobj, "bus");
+ sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id);
+ device_remove_attrs(dev->bus, dev);
+ put_bus(dev->bus);
+ }
+}
+
+/**
* bus_remove_device - remove device from bus
* @dev: device to be removed
*
diff -puN drivers/base/core.c~driver-core-bus_attach_device-retval-check drivers/base/core.c
--- a/drivers/base/core.c~driver-core-bus_attach_device-retval-check
+++ a/drivers/base/core.c
@@ -530,7 +530,9 @@ int device_add(struct device *dev)
if ((error = bus_add_device(dev)))
goto BusError;
kobject_uevent(&dev->kobj, KOBJ_ADD);
- bus_attach_device(dev);
+ error = bus_attach_device(dev);
+ if (error)
+ goto attachError;
if (parent)
klist_add_tail(&dev->knode_parent, &parent->klist_children);
@@ -548,6 +550,8 @@ int device_add(struct device *dev)
Done:
put_device(dev);
return error;
+ attachError:
+ bus_delete_device(dev);
BusError:
device_pm_remove(dev);
PMError:
_
Patches currently in -mm which might be from cornelia.huck@xxxxxxxxxx are
origin.patch
driver-core-fixes-make_class_name-retval-check.patch
driver-core-fixes-device_register-retval-check-in.patch
driver-core-fixes-check-for-return-value-of-sysfs_create_link.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
