1 files changed, 2 insertions, 5 deletions

diff --git a/arch/openrisc/include/asm/syscall.h b/arch/openrisc/include/asm/syscall.h
index 9f0337055d26..b752bb67891d 100644
--- a/arch/openrisc/include/asm/syscall.h
+++ b/arch/openrisc/include/asm/syscall.h
@@ -25,7 +25,7 @@
 static inline int
 syscall_get_nr(struct task_struct *task, struct pt_regs *regs)
 {
-        return regs->syscallno ? regs->syscallno : -1;
+        return regs->orig_gpr11;
 }
 
 static inline void
@@ -50,10 +50,7 @@ static inline void
 syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,
                          int error, long val)
 {
-        if (error)
-                regs->gpr[11] = -error;
-        else
-                regs->gpr[11] = val;
+        regs->gpr[11] = (long) error ?: val;
 }
 
 static inline void