Merge 3.10-rc3 into usb-next

We want these fixes.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 11 insertions, 8 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 1a68f947ded8..d414331b480e 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -1295,6 +1295,7 @@ int subsys_virtual_register(struct bus_type *subsys,
 
         return subsys_register(subsys, groups, virtual_dir);
 }
+EXPORT_SYMBOL_GPL(subsys_virtual_register);
 
 int __init buses_init(void)
 {
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 016312437577..2499cefdcdf2 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -572,9 +572,11 @@ int device_create_file(struct device *dev,
 
         if (dev) {
                 WARN(((attr->attr.mode & S_IWUGO) && !attr->store),
-                                "Write permission without 'store'\n");
+                        "Attribute %s: write permission without 'store'\n",
+                        attr->attr.name);
                 WARN(((attr->attr.mode & S_IRUGO) && !attr->show),
-                                "Read permission without 'show'\n");
+                        "Attribute %s: read permission without 'show'\n",
+                        attr->attr.name);
                 error = sysfs_create_file(&dev->kobj, &attr->attr);
         }
 
diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
index 39c32529b833..5da914041305 100644
--- a/drivers/base/power/common.c
+++ b/drivers/base/power/common.c
@@ -61,24 +61,24 @@ EXPORT_SYMBOL_GPL(dev_pm_get_subsys_data);
 int dev_pm_put_subsys_data(struct device *dev)
 {
         struct pm_subsys_data *psd;
-        int ret = 0;
+        int ret = 1;
 
         spin_lock_irq(&dev->power.lock);
 
         psd = dev_to_psd(dev);
-        if (!psd) {
-                ret = -EINVAL;
+        if (!psd)
                 goto out;
-        }
 
         if (--psd->refcount == 0) {
                 dev->power.subsys_data = NULL;
-                kfree(psd);
-                ret = 1;
+        } else {
+                psd = NULL;
+                ret = 0;
         }
 
  out:
         spin_unlock_irq(&dev->power.lock);
+        kfree(psd);
 
         return ret;
 }