From 11af394fec5d2723827819ce43c7205bc20fa6dc Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 19 Feb 2011 21:23:12 +0000
Subject: Fixed bug 3187105.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2744 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/ports/RVCT/ARMCMx/chcoreasm_v6m.s | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'os/ports/RVCT/ARMCMx')

diff --git a/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s b/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s
index 8f348f099..2424de03f 100644
--- a/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s
+++ b/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s
@@ -93,8 +93,9 @@ _port_switch_from_isr PROC
                 mov     r12, r1
                 msr     APSR, r0
                 mov     lr, r2
+                pop     {r0, r1, r2, r3}
                 cpsie   i
-                pop     {r0, r1, r2, r3, pc}
+                pop     {pc}
                 ENDP
 
 /*
-- 
cgit v1.2.3