summaryrefslogtreecommitdiff
path: root/drivers/net/82596.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-19 09:23:07 +0200
committerIngo Molnar <mingo@elte.hu>2008-05-19 09:23:07 +0200
commita8ac1ae3a2a8ceb5bc1d334a502d42f59b91379c (patch)
treefa3c8e81ffa64798e85425cf139fdd6ba3fd7963 /drivers/net/82596.c
parentb4ef290d7c3abd1bf8cefcf8def359537fda7f31 (diff)
parentb8291ad07a7f3b5b990900f0001198ac23ba893e (diff)
Merge branch 'linus' into x86/pattip-x86-pat-2008-05-19-07-23-07
Diffstat (limited to 'drivers/net/82596.c')
-rw-r--r--drivers/net/82596.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 2797da7eeee6..da292e647eb1 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1162,6 +1162,7 @@ struct net_device * __init i82596_probe(int unit)
memcpy(eth_addr, (void *) 0xfffc1f2c, 6); /* YUCK! Get addr from NOVRAM */
dev->base_addr = MVME_I596_BASE;
dev->irq = (unsigned) MVME16x_IRQ_I596;
+ goto found;
}
#endif
#ifdef ENABLE_BVME6000_NET
@@ -1176,6 +1177,7 @@ struct net_device * __init i82596_probe(int unit)
rtc[3] = msr;
dev->base_addr = BVME_I596_BASE;
dev->irq = (unsigned) BVME_IRQ_I596;
+ goto found;
}
#endif
#ifdef ENABLE_APRICOT
@@ -1212,8 +1214,13 @@ struct net_device * __init i82596_probe(int unit)
}
dev->irq = 10;
+ goto found;
}
#endif
+ err = -ENODEV;
+ goto out;
+
+found:
dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0);
if (!dev->mem_start) {
err = -ENOMEM;