PM: allow for usage_count > 0 in pm_runtime_get()

This patch (as1308c) fixes __pm_runtime_get().  Currently the routine
will resume a device if the prior usage count was 0.  But this isn't
right; thanks to pm_runtime_get_noresume() the usage count can be
positive even while the device is suspended.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 5a01ecef4af3600da40b8e458bc670d1223d2fbe..40d7720a4b21641dc135e9beadd4536f91b85420 100644 (file)
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -701,15 +701,15 @@ EXPORT_SYMBOL_GPL(pm_request_resume);
  * @dev: Device to handle.
  * @sync: If set and the device is suspended, resume it synchronously.
  *
- * Increment the usage count of the device and if it was zero previously,
- * resume it or submit a resume request for it, depending on the value of @sync.
+ * Increment the usage count of the device and resume it or submit a resume
+ * request for it, depending on the value of @sync.
  */
 int __pm_runtime_get(struct device *dev, bool sync)
 {
-       int retval = 1;
+       int retval;
 
-       if (atomic_add_return(1, &dev->power.usage_count) == 1)
-               retval = sync ? pm_runtime_resume(dev) : pm_request_resume(dev);
+       atomic_inc(&dev->power.usage_count);
+       retval = sync ? pm_runtime_resume(dev) : pm_request_resume(dev);
 
        return retval;
 }