diff --git a/libcpu/arm/at91sam926x/context_rvds.S b/libcpu/arm/at91sam926x/context_rvds.S
index 8f7bab61ef2d6bc3862c58a0eae0bdc05f01b20d..86f13dd1bacf1ed3179591fed4a801754db1e806 100644
--- a/libcpu/arm/at91sam926x/context_rvds.S
+++ b/libcpu/arm/at91sam926x/context_rvds.S
@@ -60,9 +60,9 @@ rt_hw_context_switch	PROC
 	LDMFD	sp!, {r4}			; pop new task spsr
 	MSR	spsr_cxsf, r4
 	LDMFD	sp!, {r4}			; pop new task cpsr
-	MSR	cpsr_cxsf, r4
+	MSR	spsr_cxsf, r4
 
-	LDMFD	sp!, {r0-r12, lr, pc}	; pop new task r0-r12, lr & pc
+	LDMFD	sp!, {r0-r12, lr, pc}^	; pop new task r0-r12, lr & pc
 	ENDP
 
 ;/*