From 8e36cf3a48ffca4c020c1d1ababeb59ba5b833fa Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Sun, 17 Jan 2010 19:22:28 -0200 Subject: [PATCH] --- yaml --- r: 187751 b: refs/heads/master c: de8164fb2242d77c8a83fb3c63830eb7914d696d h: refs/heads/master i: 187749: 73e1eb054924696aca0010598fe03c5a2ab9a7dc 187747: b9562d4af27c9c75d73f1cf85bf49eb08caaab3e 187743: c203de4427542cb6526788a33420288322e47763 v: v3 --- [refs] | 2 +- trunk/Documentation/power/runtime_pm.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d78d39de6387..90332c684db7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af66585270ef99aa6097faf3bd7344855077e75d +refs/heads/master: de8164fb2242d77c8a83fb3c63830eb7914d696d diff --git a/trunk/Documentation/power/runtime_pm.txt b/trunk/Documentation/power/runtime_pm.txt index 356fd86f4ea8..8602e15212d6 100644 --- a/trunk/Documentation/power/runtime_pm.txt +++ b/trunk/Documentation/power/runtime_pm.txt @@ -250,7 +250,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: to suspend the device again in future int pm_runtime_resume(struct device *dev); - - execute the subsystem-leve resume callback for the device; returns 0 on + - execute the subsystem-level resume callback for the device; returns 0 on success, 1 if the device's run-time PM status was already 'active' or error code on failure, where -EAGAIN means it may be safe to attempt to resume the device again in future, but 'power.runtime_error' should be