Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750736AbWJFH4s (ORCPT ); Fri, 6 Oct 2006 03:56:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750739AbWJFH4s (ORCPT ); Fri, 6 Oct 2006 03:56:48 -0400 Received: from mtagate4.de.ibm.com ([195.212.29.153]:53809 "EHLO mtagate4.de.ibm.com") by vger.kernel.org with ESMTP id S1750736AbWJFH4r (ORCPT ); Fri, 6 Oct 2006 03:56:47 -0400 Date: Fri, 6 Oct 2006 09:57:18 +0200 From: Cornelia Huck To: Cornelia Huck Cc: Alan Stern , Greg KH , Jaroslav Kysela , Jiri Kosina , Castet Matthieu , Takashi Iwai , LKML , ALSA development , Andrew Morton Subject: [PATCH] driver core: bus_attach_device() retval check Message-ID: <20061006095718.5c28c809@gondolin.boeblingen.de.ibm.com> In-Reply-To: <20061006095334.3cdebcc0@gondolin.boeblingen.de.ibm.com> References: <20061005175852.GC15180@suse.de> <20061006095334.3cdebcc0@gondolin.boeblingen.de.ibm.com> X-Mailer: Sylpheed-Claws 2.5.0-rc3 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2745 Lines: 87 From: Cornelia Huck 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 --- drivers/base/base.h | 1 + drivers/base/bus.c | 21 ++++++++++++++++++++- drivers/base/core.c | 6 +++++- 3 files changed, 26 insertions(+), 2 deletions(-) --- linux-2.6-CH.orig/drivers/base/base.h +++ linux-2.6-CH/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); --- linux-2.6-CH.orig/drivers/base/bus.c +++ linux-2.6-CH/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 * --- linux-2.6-CH.orig/drivers/base/core.c +++ linux-2.6-CH/drivers/base/core.c @@ -479,7 +479,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); @@ -498,6 +500,8 @@ int device_add(struct device *dev) kfree(class_name); put_device(dev); return error; + attachError: + bus_delete_device(dev); BusError: device_pm_remove(dev); PMError: - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/