]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] powerpc: return correct rtas status from ibm,suspend-me
authorDave C Boutcher <boutcher@cs.umn.edu>
Fri, 3 Feb 2006 07:18:46 +0000 (01:18 -0600)
committerPaul Mackerras <paulus@samba.org>
Tue, 7 Feb 2006 10:32:43 +0000 (21:32 +1100)
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>
arch/powerpc/kernel/rtas.c

index b7092a47064b35e15d234cc354441921c846deb8..f9b34e3ccf5a25985ffdb420b025450bcac62fae 100644 (file)
@@ -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");