aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave C Boutcher <boutcher@cs.umn.edu>2006-02-03 01:18:46 -0600
committerPaul Mackerras <paulus@samba.org>2006-02-07 21:32:43 +1100
commitc4cb8ecca66e3f136f66b5b30ec189530290a9b9 (patch)
treea52794685fafc99bfa749b5499603fc40d11be29
parent31a7f67e587aa0745a132ae68efa7f15dac677f9 (diff)
[PATCH] powerpc: return correct rtas status from ibm,suspend-me
Correctly return the status from the RTAS call. rtas_call expects to return the status as a return value. Signed-off-by: Dave Boutcher <sleddog@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/rtas.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index b7092a47064..f9b34e3ccf5 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -588,8 +588,8 @@ static void rtas_percpu_suspend_me(void *info)
if (rc == H_Continue) {
data->waiting = 0;
- rtas_call(ibm_suspend_me_token, 0, 1,
- data->args->args);
+ data->args->args[data->args->nargs] =
+ rtas_call(ibm_suspend_me_token, 0, 1, NULL);
} else {
data->waiting = -EBUSY;
printk(KERN_ERR "Error on H_Join hypervisor call\n");