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