From 032162bcc39bf14067ccfdce5d02e25fe84b96dc Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Sat, 14 Feb 2009 11:12:10 +0000 Subject: [PATCH] --- yaml --- r: 134585 b: refs/heads/master c: f11bf7a31e9a3dccf893e0fceeb1d7d9fd4dfcb4 h: refs/heads/master i: 134583: d86a84b455b76de2158aa8498ea749f584effabd v: v3 --- [refs] | 2 +- trunk/drivers/net/e2100.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 505ce10c7c46..2ecd17675947 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1256f7394cc08c60d4502a2f08d7260f3fd97d56 +refs/heads/master: f11bf7a31e9a3dccf893e0fceeb1d7d9fd4dfcb4 diff --git a/trunk/drivers/net/e2100.c b/trunk/drivers/net/e2100.c index b07ba1924de0..d2f6ee1a6290 100644 --- a/trunk/drivers/net/e2100.c +++ b/trunk/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;