Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)
  debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
  sysfs: remove "last sysfs file:" line from the oops messages
  drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION"
  memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION
  SYSFS: Fix erroneous comments for sysfs_update_group().
  driver core: remove the driver-model structures from the documentation
  driver core: Add the device driver-model structures to kerneldoc
  Translated Documentation/email-clients.txt
  RAW driver: Remove call to kobject_put().
  reboot: disable usermodehelper to prevent fs access
  efivars: prevent oops on unload when efi is not enabled
  Allow setting of number of raw devices as a module parameter
  Introduce CONFIG_GOOGLE_FIRMWARE
  driver: Google Memory Console
  driver: Google EFI SMI
  x86: Better comments for get_bios_ebda()
  x86: get_bios_ebda_length()
  misc: fix ti-st build issues
  params.c: Use new strtobool function to process boolean inputs
  debugfs: move to new strtobool
  ...

Fix up trivial conflicts in fs/debugfs/file.c due to the same patch
being applied twice, and an unrelated cleanup nearby.

1 files changed, 19 insertions, 19 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 48425f183029..1c291af637b3 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -192,18 +192,18 @@ EXPORT_SYMBOL_GPL(platform_device_alloc);
 int platform_device_add_resources(struct platform_device *pdev,
                                   const struct resource *res, unsigned int num)
 {
-        struct resource *r;
+        struct resource *r = NULL;
 
-        if (!res)
-                return 0;
-
-        r = kmemdup(res, sizeof(struct resource) * num, GFP_KERNEL);
-        if (r) {
-                pdev->resource = r;
-                pdev->num_resources = num;
-                return 0;
+        if (res) {
+                r = kmemdup(res, sizeof(struct resource) * num, GFP_KERNEL);
+                if (!r)
+                        return -ENOMEM;
         }
-        return -ENOMEM;
+
+        kfree(pdev->resource);
+        pdev->resource = r;
+        pdev->num_resources = num;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(platform_device_add_resources);
 
@@ -220,17 +220,17 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources);
 int platform_device_add_data(struct platform_device *pdev, const void *data,
                              size_t size)
 {
-        void *d;
+        void *d = NULL;
 
-        if (!data)
-                return 0;
-
-        d = kmemdup(data, size, GFP_KERNEL);
-        if (d) {
-                pdev->dev.platform_data = d;
-                return 0;
+        if (data) {
+                d = kmemdup(data, size, GFP_KERNEL);
+                if (!d)
+                        return -ENOMEM;
         }
-        return -ENOMEM;
+
+        kfree(pdev->dev.platform_data);
+        pdev->dev.platform_data = d;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(platform_device_add_data);