From 8bbb3b5d677b0082b314daab701f9226ad359175 Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Fri, 26 Dec 2008 00:07:45 -0800 Subject: [PATCH] --- yaml --- r: 122915 b: refs/heads/master c: ec1d1ebbb3bdc9807474be28c29efa155d15b850 h: refs/heads/master i: 122913: 9b7afb12117a8b9658244172b3ba676ba1be9e21 122911: ec31b5aec30f7f2eba6eb430923b0fbc898b91ae v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/de2104x.c | 4 ++-- trunk/drivers/net/tulip/tulip_core.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9c7d578fbf49..e19f7d93bf68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27cd6ae5619084f363630683e77d70be38075afe +refs/heads/master: ec1d1ebbb3bdc9807474be28c29efa155d15b850 diff --git a/trunk/drivers/net/tulip/de2104x.c b/trunk/drivers/net/tulip/de2104x.c index 3aa60fad68c7..5166be930a52 100644 --- a/trunk/drivers/net/tulip/de2104x.c +++ b/trunk/drivers/net/tulip/de2104x.c @@ -1691,9 +1691,9 @@ static void __devinit de21040_get_mac_address (struct de_private *de) for (i = 0; i < 6; i++) { int value, boguscnt = 100000; - do + do { value = dr32(ROMCmd); - while (value < 0 && --boguscnt > 0); + } while (value < 0 && --boguscnt > 0); de->dev->dev_addr[i] = value; udelay(1); if (boguscnt <= 0) diff --git a/trunk/drivers/net/tulip/tulip_core.c b/trunk/drivers/net/tulip/tulip_core.c index 1c5ef230b770..ff84babb3ff3 100644 --- a/trunk/drivers/net/tulip/tulip_core.c +++ b/trunk/drivers/net/tulip/tulip_core.c @@ -1429,9 +1429,9 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, for (i = 0; i < 3; i++) { int value, boguscnt = 100000; iowrite32(0x600 | i, ioaddr + 0x98); - do + do { value = ioread32(ioaddr + CSR9); - while (value < 0 && --boguscnt > 0); + } while (value < 0 && --boguscnt > 0); put_unaligned_le16(value, ((__le16 *)dev->dev_addr) + i); sum += value & 0xffff; }