Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122915
b: refs/heads/master
c: ec1d1eb
h: refs/heads/master
i:
  122913: 9b7afb1
  122911: ec31b5a
v: v3
  • Loading branch information
Hannes Eder authored and David S. Miller committed Dec 26, 2008
1 parent 719211a commit 8bbb3b5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 27cd6ae5619084f363630683e77d70be38075afe
refs/heads/master: ec1d1ebbb3bdc9807474be28c29efa155d15b850
4 changes: 2 additions & 2 deletions trunk/drivers/net/tulip/de2104x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/tulip/tulip_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 8bbb3b5

Please sign in to comment.