From fec82b1e22421121e38e59d9afd5fada7e1d4f59 Mon Sep 17 00:00:00 2001
From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Wed, 10 Apr 2013 17:00:48 +0200
Subject: [PATCH] --- yaml --- r: 363254 b: refs/heads/master c:
 fa180eb448fa263cf18dd930143b515d27d70d7b h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/base/dd.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 962f0c4252ca..5b25b7fbf558 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e4098a3e08783cfd75f9fcdab276dc1d46931da
+refs/heads/master: fa180eb448fa263cf18dd930143b515d27d70d7b
diff --git a/trunk/drivers/base/dd.c b/trunk/drivers/base/dd.c
index bb5645ea0282..35fa36898916 100644
--- a/trunk/drivers/base/dd.c
+++ b/trunk/drivers/base/dd.c
@@ -380,7 +380,7 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)
 
 	pm_runtime_barrier(dev);
 	ret = really_probe(dev, drv);
-	pm_runtime_idle(dev);
+	pm_request_idle(dev);
 
 	return ret;
 }
@@ -428,7 +428,7 @@ int device_attach(struct device *dev)
 		}
 	} else {
 		ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
-		pm_runtime_idle(dev);
+		pm_request_idle(dev);
 	}
 out_unlock:
 	device_unlock(dev);
@@ -499,7 +499,7 @@ static void __device_release_driver(struct device *dev)
 						     BUS_NOTIFY_UNBIND_DRIVER,
 						     dev);
 
-		pm_runtime_put_sync(dev);
+		pm_runtime_put(dev);
 
 		if (dev->bus && dev->bus->remove)
 			dev->bus->remove(dev);