Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  remove "struct subsystem" as it is no longer needed
  sysfs: printk format warning
  DOC: Fix wrong identifier name in Documentation/driver-model/devres.txt
  platform: reorder platform_device_del
  Driver core: fix show_uevent from taking up way too much stack

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 30480f6f2af2..17b5ece8f82c 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -292,20 +292,22 @@ EXPORT_SYMBOL_GPL(platform_device_add);
  *      @pdev:  platform device we're removing
  *
  *      Note that this function will also release all memory- and port-based
- *      resources owned by the device (@dev->resource).
+ *      resources owned by the device (@dev->resource).  This function
+ *      must _only_ be externally called in error cases.  All other usage
+ *      is a bug.
  */
 void platform_device_del(struct platform_device *pdev)
 {
         int i;
 
         if (pdev) {
+                device_del(&pdev->dev);
+
                 for (i = 0; i < pdev->num_resources; i++) {
                         struct resource *r = &pdev->resource[i];
                         if (r->flags & (IORESOURCE_MEM|IORESOURCE_IO))
                                 release_resource(r);
                 }
-
-                device_del(&pdev->dev);
         }
 }
 EXPORT_SYMBOL_GPL(platform_device_del);