From cfe2f818644a081a6a3d4aa0db27d78732b6c6fb Mon Sep 17 00:00:00 2001
From: Denis Kirjanov <dkirjanov@kernel.org>
Date: Tue, 21 Dec 2010 02:01:36 +0000
Subject: [PATCH] --- yaml --- r: 225221 b: refs/heads/master c:
 24de5285dce378e4170e068f2662236d2b46c033 h: refs/heads/master i:   225219:
 71d5adb0202bb7044568e40a3e4fbe1f0de9f7c1 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/sundance.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 12a6f20360fa..ad381f1d72b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12b16dadbc2406144d408754f96d0f44aa016239
+refs/heads/master: 24de5285dce378e4170e068f2662236d2b46c033
diff --git a/trunk/drivers/net/sundance.c b/trunk/drivers/net/sundance.c
index 3ed2a67bd6d3..8916f29301d6 100644
--- a/trunk/drivers/net/sundance.c
+++ b/trunk/drivers/net/sundance.c
@@ -294,6 +294,9 @@ enum alta_offsets {
 	/* Aliased and bogus values! */
 	RxStatus = 0x0c,
 };
+
+#define ASIC_HI_WORD(x)	((x) + 2)
+
 enum ASICCtrl_HiWord_bit {
 	GlobalReset = 0x0001,
 	RxReset = 0x0002,
@@ -1772,10 +1775,10 @@ static int netdev_close(struct net_device *dev)
     	}
 
     	iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset,
-			ioaddr +ASICCtrl + 2);
+			ioaddr + ASIC_HI_WORD(ASICCtrl));
 
     	for (i = 2000; i > 0; i--) {
- 		if ((ioread16(ioaddr + ASICCtrl +2) & ResetBusy) == 0)
+		if ((ioread16(ioaddr + ASIC_HI_WORD(ASICCtrl)) & ResetBusy) == 0)
 			break;
 		mdelay(1);
     	}