commit aeabbbbe126f3d5e61e2db07629443cd10932bb2
author Nicolas Pitre <nico@org.rmk.(none)> Wed Jun 08 19:00:16 2005 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Jun 08 19:00:16 2005 +0100
tree 36955efefca5f102c9c1e67fba3743ae91927062
parent 57cfa5e97ff60d909a7e0a5f6e4d0a49aa3e2aec

[PATCH] ARM: 2705/1: fix writesw for misaligned source pointer

Patch from Nicolas Pitre

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/lib/io-writesw-armv4.S

diff --git a/arch/arm/lib/io-writesw-armv4.S b/arch/arm/lib/io-writesw-armv4.S
index 6d1d7c2..5e240e4 100644
--- a/arch/arm/lib/io-writesw-armv4.S
+++ b/arch/arm/lib/io-writesw-armv4.S
@@ -87,9 +87,9 @@
 		subs	r2, r2, #2
 		orr	ip, ip, r3, push_hbyte1
 		strh	ip, [r0]
-		bpl	2b
+		bpl	1b
 
-3:		tst	r2, #1
-2:		movne	ip, r3, lsr #8
+		tst	r2, #1
+3:		movne	ip, r3, lsr #8
 		strneh	ip, [r0]
 		mov	pc, lr