4 files changed, 41 insertions, 45 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 81b78ede37c..bc8729d603a 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -400,7 +400,7 @@ static void device_remove_groups(struct device *dev,
 static int device_add_attrs(struct device *dev)
 {
         struct class *class = dev->class;
-        struct device_type *type = dev->type;
+        const struct device_type *type = dev->type;
         int error;
 
         if (class) {
@@ -440,7 +440,7 @@ static int device_add_attrs(struct device *dev)
 static void device_remove_attrs(struct device *dev)
 {
         struct class *class = dev->class;
-        struct device_type *type = dev->type;
+        const struct device_type *type = dev->type;
 
         device_remove_groups(dev, dev->groups);
 
@@ -1314,8 +1314,7 @@ EXPORT_SYMBOL_GPL(put_device);
 EXPORT_SYMBOL_GPL(device_create_file);
 EXPORT_SYMBOL_GPL(device_remove_file);
 
-struct root_device
-{
+struct root_device {
         struct device dev;
         struct module *owner;
 };
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 29917c7506c..6658da743c3 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -245,6 +245,10 @@ int device_attach(struct device *dev)
 
         device_lock(dev);
         if (dev->driver) {
+                if (klist_node_attached(&dev->p->knode_driver)) {
+                        ret = 1;
+                        goto out_unlock;
+                }
                 ret = device_bind_driver(dev);
                 if (ret == 0)
                         ret = 1;
@@ -257,6 +261,7 @@ int device_attach(struct device *dev)
                 ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
                 pm_runtime_put_sync(dev);
         }
+out_unlock:
         device_unlock(dev);
         return ret;
 }
@@ -408,17 +413,16 @@ void *dev_get_drvdata(const struct device *dev)
 }
 EXPORT_SYMBOL(dev_get_drvdata);
 
-void dev_set_drvdata(struct device *dev, void *data)
+int dev_set_drvdata(struct device *dev, void *data)
 {
         int error;
 
-        if (!dev)
-                return;
         if (!dev->p) {
                 error = device_private_init(dev);
                 if (error)
-                        return;
+                        return error;
         }
         dev->p->driver_data = data;
+        return 0;
 }
 EXPORT_SYMBOL(dev_set_drvdata);
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 3da6a43b775..0a134a424a3 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -48,7 +48,8 @@ static const char *memory_uevent_name(struct kset *kset, struct kobject *kobj)
         return MEMORY_CLASS_NAME;
 }
 
-static int memory_uevent(struct kset *kset, struct kobject *obj, struct kobj_uevent_env *env)
+static int memory_uevent(struct kset *kset, struct kobject *obj,
+                        struct kobj_uevent_env *env)
 {
         int retval = 0;
 
@@ -228,10 +229,11 @@ int memory_isolate_notify(unsigned long val, void *v)
  * OK to have direct references to sparsemem variables in here.
  */
 static int
-memory_section_action(unsigned long phys_index, unsigned long action)
+memory_block_action(unsigned long phys_index, unsigned long action)
 {
         int i;
         unsigned long start_pfn, start_paddr;
+        unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block;
         struct page *first_page;
         int ret;
 
@@ -243,7 +245,7 @@ memory_section_action(unsigned long phys_index, unsigned long action)
          * that way.
          */
         if (action == MEM_ONLINE) {
-                for (i = 0; i < PAGES_PER_SECTION; i++) {
+                for (i = 0; i < nr_pages; i++) {
                         if (PageReserved(first_page+i))
                                 continue;
 
@@ -257,12 +259,12 @@ memory_section_action(unsigned long phys_index, unsigned long action)
         switch (action) {
                 case MEM_ONLINE:
                         start_pfn = page_to_pfn(first_page);
-                        ret = online_pages(start_pfn, PAGES_PER_SECTION);
+                        ret = online_pages(start_pfn, nr_pages);
                         break;
                 case MEM_OFFLINE:
                         start_paddr = page_to_pfn(first_page) << PAGE_SHIFT;
                         ret = remove_memory(start_paddr,
-                                            PAGES_PER_SECTION << PAGE_SHIFT);
+                                            nr_pages << PAGE_SHIFT);
                         break;
                 default:
                         WARN(1, KERN_WARNING "%s(%ld, %ld) unknown action: "
@@ -276,7 +278,7 @@ memory_section_action(unsigned long phys_index, unsigned long action)
 static int memory_block_change_state(struct memory_block *mem,
                 unsigned long to_state, unsigned long from_state_req)
 {
-        int i, ret = 0;
+        int ret = 0;
 
         mutex_lock(&mem->state_mutex);
 
@@ -288,20 +290,11 @@ static int memory_block_change_state(struct memory_block *mem,
         if (to_state == MEM_OFFLINE)
                 mem->state = MEM_GOING_OFFLINE;
 
-        for (i = 0; i < sections_per_block; i++) {
-                ret = memory_section_action(mem->start_section_nr + i,
-                                            to_state);
-                if (ret)
-                        break;
-        }
-
-        if (ret) {
-                for (i = 0; i < sections_per_block; i++)
-                        memory_section_action(mem->start_section_nr + i,
-                                              from_state_req);
+        ret = memory_block_action(mem->start_section_nr, to_state);
 
+        if (ret)
                 mem->state = from_state_req;
-        } else
+        else
                 mem->state = to_state;
 
 out:
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 48425f18302..1c291af637b 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);