From aaeed48e42b86fe6bab6982c9f262606fe5ae564 Mon Sep 17 00:00:00 2001
From: Evgeniy Dushistov <dushistov@mail.ru>
Date: Sun, 4 Nov 2007 23:22:29 +0300
Subject: [PATCH] --- yaml --- r: 73215 b: refs/heads/master c:
 d2ea732e9ecb68841206f2761ae91360da87cfac h: refs/heads/master i:   73213:
 66ed3b3bd41b3210a010a6e2f5f133d822f9b6b8   73211:
 4ac92d3476a0e6be700de348e3e7bb8d26a87418   73207:
 fe3f84474f303baf3b52d901d0c64c5bf5504c4e   73199:
 d2e9eeb2c88f72dfcb0bbe2a6f12ace0fab98402   73183:
 c5d534e1c82869f10f1f82821b7870c5d5e0ff56   73151:
 e43f86f47b7907940238e94474c687773e2e443f   73087:
 220d070f18ea1450ce7b33a9394bcb25f8442b2e   72959:
 c7a4b3ce34229034a7051c5c6044bc9228dfde80   72703:
 95b9ede29621d113f5e224cc94d0c33e09e6341b v: v3

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

diff --git a/[refs] b/[refs]
index 7f086ae46269..812feb955a47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cacd40e07c5ad7068221b3910098f1d364e74e45
+refs/heads/master: d2ea732e9ecb68841206f2761ae91360da87cfac
diff --git a/trunk/drivers/net/82596.c b/trunk/drivers/net/82596.c
index bb30d5be7824..2797da7eeee6 100644
--- a/trunk/drivers/net/82596.c
+++ b/trunk/drivers/net/82596.c
@@ -1192,6 +1192,8 @@ struct net_device * __init i82596_probe(int unit)
 			goto out;
 		}
 
+		dev->base_addr = ioaddr;
+
 		for (i = 0; i < 8; i++) {
 			eth_addr[i] = inb(ioaddr + 8 + i);
 			checksum += eth_addr[i];
@@ -1209,7 +1211,6 @@ struct net_device * __init i82596_probe(int unit)
 			goto out1;
 		}
 
-		dev->base_addr = ioaddr;
 		dev->irq = 10;
 	}
 #endif