From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 2 Oct 2005 17:02:25 +0000 (+0100)
Subject: [ARM] Fix EBSA110 network driver link detection
X-Git-Tag: v2.6.14-rc4~86^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0e3a64e2162f971180bf1fdd91c263dbdfcfd385;p=linux-2.6-omap-h63xx.git

[ARM] Fix EBSA110 network driver link detection

EBSA110 link detection didn't read the register - it wrote it.  Oops.

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

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index 9b659e3c8d6..9f6eb39cf49 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -85,7 +85,7 @@ static inline unsigned short read_ireg(u_long base_addr, u_int reg)
 	u_short v;
 	__asm__(
 	"str%?h	%1, [%2]	@ NAT_RAP\n\t"
-	"str%?h	%0, [%2, #8]	@ NET_IDP\n\t"
+	"ldr%?h	%0, [%2, #8]	@ NET_IDP\n\t"
 	: "=r" (v)
 	: "r" (reg), "r" (ISAIO_BASE + 0x0464));
 	return v;