Merge branch 'linus'

6 files changed, 45 insertions, 17 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index c3141565d59d..48718b7f4fa0 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -536,6 +536,28 @@ void bus_rescan_devices(struct bus_type * bus)
         bus_for_each_dev(bus, NULL, NULL, bus_rescan_devices_helper);
 }
 
+/**
+ * device_reprobe - remove driver for a device and probe for a new driver
+ * @dev: the device to reprobe
+ *
+ * This function detaches the attached driver (if any) for the given
+ * device and restarts the driver probing process.  It is intended
+ * to use if probing criteria changed during a devices lifetime and
+ * driver attachment should change accordingly.
+ */
+void device_reprobe(struct device *dev)
+{
+        if (dev->driver) {
+                if (dev->parent)        /* Needed for USB */
+                        down(&dev->parent->sem);
+                device_release_driver(dev);
+                if (dev->parent)
+                        up(&dev->parent->sem);
+        }
+
+        bus_rescan_devices_helper(dev, NULL);
+}
+EXPORT_SYMBOL_GPL(device_reprobe);
 
 struct bus_type * get_bus(struct bus_type * bus)
 {
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 07a7f97e1de9..29f3d7504da1 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -141,7 +141,7 @@ int __devinit register_cpu(struct cpu *cpu, int num, struct node *root)
         return error;
 }
 
-struct sys_device *get_cpu_sysdev(int cpu)
+struct sys_device *get_cpu_sysdev(unsigned cpu)
 {
         if (cpu < NR_CPUS)
                 return cpu_sys_devices[cpu];
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index e97e911ebf7a..472318205236 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -211,18 +211,20 @@ static int
 fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
 {
         u8 *new_data;
+        int new_size = fw_priv->alloc_size;
 
         if (min_size <= fw_priv->alloc_size)
                 return 0;
 
-        new_data = vmalloc(fw_priv->alloc_size + PAGE_SIZE);
+        new_size = ALIGN(min_size, PAGE_SIZE);
+        new_data = vmalloc(new_size);
         if (!new_data) {
                 printk(KERN_ERR "%s: unable to alloc buffer\n", __FUNCTION__);
                 /* Make sure that we don't keep incomplete data */
                 fw_load_abort(fw_priv);
                 return -ENOMEM;
         }
-        fw_priv->alloc_size += PAGE_SIZE;
+        fw_priv->alloc_size = new_size;
         if (fw_priv->fw->data) {
                 memcpy(new_data, fw_priv->fw->data, fw_priv->fw->size);
                 vfree(fw_priv->fw->data);
diff --git a/drivers/base/map.c b/drivers/base/map.c
index b449dae6f0d3..e87017f36853 100644
--- a/drivers/base/map.c
+++ b/drivers/base/map.c
@@ -11,6 +11,7 @@
 
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/mutex.h>
 #include <linux/kdev_t.h>
 #include <linux/kobject.h>
 #include <linux/kobj_map.h>
@@ -25,7 +26,7 @@ struct kobj_map {
                 int (*lock)(dev_t, void *);
                 void *data;
         } *probes[255];
-        struct semaphore *sem;
+        struct mutex *lock;
 };
 
 int kobj_map(struct kobj_map *domain, dev_t dev, unsigned long range,
@@ -53,7 +54,7 @@ int kobj_map(struct kobj_map *domain, dev_t dev, unsigned long range,
                 p->range = range;
                 p->data = data;
         }
-        down(domain->sem);
+        mutex_lock(domain->lock);
         for (i = 0, p -= n; i < n; i++, p++, index++) {
                 struct probe **s = &domain->probes[index % 255];
                 while (*s && (*s)->range < range)
@@ -61,7 +62,7 @@ int kobj_map(struct kobj_map *domain, dev_t dev, unsigned long range,
                 p->next = *s;
                 *s = p;
         }
-        up(domain->sem);
+        mutex_unlock(domain->lock);
         return 0;
 }
 
@@ -75,7 +76,7 @@ void kobj_unmap(struct kobj_map *domain, dev_t dev, unsigned long range)
         if (n > 255)
                 n = 255;
 
-        down(domain->sem);
+        mutex_lock(domain->lock);
         for (i = 0; i < n; i++, index++) {
                 struct probe **s;
                 for (s = &domain->probes[index % 255]; *s; s = &(*s)->next) {
@@ -88,7 +89,7 @@ void kobj_unmap(struct kobj_map *domain, dev_t dev, unsigned long range)
                         }
                 }
         }
-        up(domain->sem);
+        mutex_unlock(domain->lock);
         kfree(found);
 }
 
@@ -99,7 +100,7 @@ struct kobject *kobj_lookup(struct kobj_map *domain, dev_t dev, int *index)
         unsigned long best = ~0UL;
 
 retry:
-        down(domain->sem);
+        mutex_lock(domain->lock);
         for (p = domain->probes[MAJOR(dev) % 255]; p; p = p->next) {
                 struct kobject *(*probe)(dev_t, int *, void *);
                 struct module *owner;
@@ -120,7 +121,7 @@ retry:
                         module_put(owner);
                         continue;
                 }
-                up(domain->sem);
+                mutex_unlock(domain->lock);
                 kobj = probe(dev, index, data);
                 /* Currently ->owner protects _only_ ->probe() itself. */
                 module_put(owner);
@@ -128,11 +129,11 @@ retry:
                         return kobj;
                 goto retry;
         }
-        up(domain->sem);
+        mutex_unlock(domain->lock);
         return NULL;
 }
 
-struct kobj_map *kobj_map_init(kobj_probe_t *base_probe, struct semaphore *sem)
+struct kobj_map *kobj_map_init(kobj_probe_t *base_probe, struct mutex *lock)
 {
         struct kobj_map *p = kmalloc(sizeof(struct kobj_map), GFP_KERNEL);
         struct probe *base = kzalloc(sizeof(*base), GFP_KERNEL);
@@ -149,6 +150,6 @@ struct kobj_map *kobj_map_init(kobj_probe_t *base_probe, struct semaphore *sem)
         base->get = base_probe;
         for (i = 0; i < 255; i++)
                 p->probes[i] = base;
-        p->sem = sem;
+        p->lock = lock;
         return p;
 }
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 461554a02517..83f5c5984d1a 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -61,7 +61,7 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)
 {
         struct resource *r = platform_get_resource(dev, IORESOURCE_IRQ, num);
 
-        return r ? r->start : 0;
+        return r ? r->start : -ENXIO;
 }
 EXPORT_SYMBOL_GPL(platform_get_irq);
 
@@ -98,7 +98,7 @@ int platform_get_irq_byname(struct platform_device *dev, char *name)
 {
         struct resource *r = platform_get_resource_byname(dev, IORESOURCE_IRQ, name);
 
-        return r ? r->start : 0;
+        return r ? r->start : -ENXIO;
 }
 EXPORT_SYMBOL_GPL(platform_get_irq_byname);
 
@@ -326,7 +326,7 @@ EXPORT_SYMBOL_GPL(platform_device_register);
  *      platform_device_unregister - unregister a platform-level device
  *      @pdev:  platform device we're unregistering
  *
- *      Unregistration is done in 2 steps. Fisrt we release all resources
+ *      Unregistration is done in 2 steps. First we release all resources
  *      and remove it from the subsystem, then we drop reference count by
  *      calling platform_device_put().
  */
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 8660779fb288..bdb60663f2ef 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -8,6 +8,7 @@
  *
  */
 
+#include <linux/vt_kern.h>
 #include <linux/device.h>
 #include "../base.h"
 #include "power.h"
@@ -62,7 +63,6 @@ int suspend_device(struct device * dev, pm_message_t state)
         return error;
 }
 
-
 /**
  *      device_suspend - Save state and stop all devices in system.
  *      @state:         Power state to put each device in.
@@ -82,6 +82,9 @@ int device_suspend(pm_message_t state)
 {
         int error = 0;
 
+        if (!is_console_suspend_safe())
+                return -EINVAL;
+
         down(&dpm_sem);
         down(&dpm_list_sem);
         while (!list_empty(&dpm_active) && error == 0) {