[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>

diff --git a/arch/arm/lib/io-writesw-armv4.S b/arch/arm/lib/io-writesw-armv4.S
index 6d1d7c27806e407f6c2efaf0c1f7fcbc16927614..5e240e452af6af66b2d9d18321009fddea82c73e 100644 (file)
--- a/arch/arm/lib/io-writesw-armv4.S
+++ b/arch/arm/lib/io-writesw-armv4.S
@@ -87,9 +87,9 @@ ENTRY(__raw_writesw)
                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