diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-28 03:19:16 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-28 03:19:16 +0300 |
| commit | a83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch) | |
| tree | 5b5c7c3a56898485479291b7c964a1f3887d469c /drivers/net/e2100.c | |
| parent | f9384d41c02408dd404aa64d66d0ef38adcf6479 (diff) | |
| parent | 0b4d569de222452bcb55a4a536ade6cf4d8d1e30 (diff) | |
| download | linux-a83398570e17af6bb81eb94f4f5dd356bd2828d8.tar.xz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/e2100.c')
| -rw-r--r-- | drivers/net/e2100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c index b07ba1924de0..d2f6ee1a6290 100644 --- a/drivers/net/e2100.c +++ b/drivers/net/e2100.c @@ -216,13 +216,13 @@ static int __init e21_probe1(struct net_device *dev, int ioaddr) printk(" %02X", station_addr[i]); if (dev->irq < 2) { - int irqlist[] = {15,11,10,12,5,9,3,4}, i; - for (i = 0; i < 8; i++) + int irqlist[] = {15, 11, 10, 12, 5, 9, 3, 4}; + for (i = 0; i < ARRAY_SIZE(irqlist); i++) if (request_irq (irqlist[i], NULL, 0, "bogus", NULL) != -EBUSY) { dev->irq = irqlist[i]; break; } - if (i >= 8) { + if (i >= ARRAY_SIZE(irqlist)) { printk(" unable to get IRQ %d.\n", dev->irq); retval = -EAGAIN; goto out; |