---

yaml --- r: 172351 b: refs/heads/master c: e1b1903 h: refs/heads/master i: 172349: 8739552 172347: 6efd851 172343: f505c09 172335: 41ba9cf 172319: a6150d5 172287: f95a71c v: v3
git-mirror · Dec 6, 2009 · dbb3230 · dbb3230
1 parent ae7aba2
commit dbb3230
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ddf0ed1d47e2d4170fa2989273886a1df66a862
+refs/heads/master: e1b1903eee71c5fa6063bbf713cfc947e76c4e04
diff --git a/trunk/Documentation/power/runtime_pm.txt b/trunk/Documentation/power/runtime_pm.txt
@@ -38,7 +38,7 @@ struct dev_pm_ops {
 	...
 	int (*runtime_suspend)(struct device *dev);
 	int (*runtime_resume)(struct device *dev);
-	void (*runtime_idle)(struct device *dev);
+	int (*runtime_idle)(struct device *dev);
 	...
 };
 
@@ -114,7 +114,8 @@ The action performed by a bus type's ->runtime_idle() callback is totally
 dependent on the bus type in question, but the expected and recommended action
 is to check if the device can be suspended (i.e. if all of the conditions
 necessary for suspending the device are satisfied) and to queue up a suspend
-request for the device in that case.
+request for the device in that case.  The value returned by this callback is
+ignored by the PM core.
 
 The helper functions provided by the PM core, described in Section 4, guarantee
 that the following constraints are met with respect to the bus type's run-time