From 3a75a0d4991558d32f7dc662df5a65a50b43eaa0 Mon Sep 17 00:00:00 2001 From: roel kluin Date: Wed, 29 Jul 2009 03:18:56 +0000 Subject: [PATCH] --- yaml --- r: 156333 b: refs/heads/master c: f0c5b35c6c93c89a9d8ccab19b0b4842f5dfddc5 h: refs/heads/master i: 156331: 979b83c4af824399457909cfda96a763d23fb047 v: v3 --- [refs] | 2 +- trunk/drivers/net/eexpress.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0b2b98c22bbc..4ac3ab9a38f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3e8ee682003685b8b9c98c89340a42e48c3e813 +refs/heads/master: f0c5b35c6c93c89a9d8ccab19b0b4842f5dfddc5 diff --git a/trunk/drivers/net/eexpress.c b/trunk/drivers/net/eexpress.c index 1686dca28748..1f016d66684a 100644 --- a/trunk/drivers/net/eexpress.c +++ b/trunk/drivers/net/eexpress.c @@ -1474,13 +1474,13 @@ static void eexp_hw_init586(struct net_device *dev) outw(0x0000, ioaddr + 0x800c); outw(0x0000, ioaddr + 0x800e); - for (i = 0; i < (sizeof(start_code)); i+=32) { + for (i = 0; i < ARRAY_SIZE(start_code) * 2; i+=32) { int j; outw(i, ioaddr + SM_PTR); - for (j = 0; j < 16; j+=2) + for (j = 0; j < 16 && (i+j)/2 < ARRAY_SIZE(start_code); j+=2) outw(start_code[(i+j)/2], ioaddr+0x4000+j); - for (j = 0; j < 16; j+=2) + for (j = 0; j < 16 && (i+j+16)/2 < ARRAY_SIZE(start_code); j+=2) outw(start_code[(i+j+16)/2], ioaddr+0x8000+j); }