From: Nicolas Pitre <nico@org.rmk.(none)>
Date: Wed, 8 Jun 2005 18:00:16 +0000 (+0100)
Subject: [PATCH] ARM: 2705/1: fix writesw for misaligned source pointer
X-Git-Tag: firefly_0821_release~42717^2~105^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aeabbbbe126f3d5e61e2db07629443cd10932bb2;p=firefly-linux-kernel-4.4.55.git

[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 6d1d7c27806e..5e240e452af6 100644
--- 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