From: Dave C Boutcher <boutcher@cs.umn.edu>
Date: Fri, 3 Feb 2006 07:18:46 +0000 (-0600)
Subject: [PATCH] powerpc: return correct rtas status from ibm,suspend-me
X-Git-Tag: v2.6.16-rc3~67^2~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4cb8ecca66e3f136f66b5b30ec189530290a9b9;p=linux-2.6

[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>
---

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index b7092a4706..f9b34e3ccf 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");