diff options
| author | Patrick Mochel <mochel@hera.kernel.org> | 2002-05-27 22:00:47 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@hera.kernel.org> | 2002-05-27 22:00:47 -0700 |
| commit | 4c9558f5572f5675122541aa45caf4e93087cdba (patch) | |
| tree | 54ca18be5ea606704090ed928f506d900ff561e5 | |
| parent | 71a15636287854af844be88e3da92e7d919ea089 (diff) | |
| parent | 3e8c3286fd62cb9da5c77f8d56935acb1262de62 (diff) | |
Merge hera.kernel.org:/home/mochel/BK/linux-2.5
into hera.kernel.org:/home/mochel/BK/linux-2.5-linus
| -rw-r--r-- | drivers/base/core.c | 9 | ||||
| -rw-r--r-- | include/linux/device.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 93b8a0bb046a..391e0abefaa0 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -96,9 +96,6 @@ void put_device(struct device * dev) DBG("DEV: Unregistering device. ID = '%s', name = '%s'\n", dev->bus_id,dev->name); - /* remove the driverfs directory */ - device_remove_dir(dev); - /* Notify the platform of the removal, in case they * need to do anything... */ @@ -112,6 +109,12 @@ void put_device(struct device * dev) if (dev->driver && dev->driver->remove) dev->driver->remove(dev,REMOVE_FREE_RESOURCES); + /* remove the driverfs directory */ + device_remove_dir(dev); + + if (dev->release) + dev->release(dev); + put_device(dev->parent); } diff --git a/include/linux/device.h b/include/linux/device.h index 96d9cb108139..ccfd221d5dcd 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -92,6 +92,8 @@ struct device { being off. */ unsigned char *saved_state; /* saved device state */ + + void (*release)(struct device * dev); }; static inline struct device * |