diff options
Diffstat (limited to 'drivers/net/dm9000.c')
-rw-r--r-- | drivers/net/dm9000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index d45bcd2660af..32a9a922f153 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
@@ -718,7 +718,7 @@ dm9000_probe(struct platform_device *pdev) | |||
718 | 718 | ||
719 | if (!is_valid_ether_addr(ndev->dev_addr)) { | 719 | if (!is_valid_ether_addr(ndev->dev_addr)) { |
720 | /* try reading from mac */ | 720 | /* try reading from mac */ |
721 | 721 | ||
722 | mac_src = "chip"; | 722 | mac_src = "chip"; |
723 | for (i = 0; i < 6; i++) | 723 | for (i = 0; i < 6; i++) |
724 | ndev->dev_addr[i] = ior(db, i+DM9000_PAR); | 724 | ndev->dev_addr[i] = ior(db, i+DM9000_PAR); |
@@ -768,7 +768,7 @@ dm9000_open(struct net_device *dev) | |||
768 | dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n"); | 768 | dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n"); |
769 | irqflags = DEFAULT_TRIGGER; | 769 | irqflags = DEFAULT_TRIGGER; |
770 | } | 770 | } |
771 | 771 | ||
772 | irqflags |= IRQF_SHARED; | 772 | irqflags |= IRQF_SHARED; |
773 | 773 | ||
774 | if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev)) | 774 | if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev)) |
@@ -1115,7 +1115,7 @@ static int dm9000_wait_eeprom(board_info_t *db) | |||
1115 | /* The DM9000 data sheets say we should be able to | 1115 | /* The DM9000 data sheets say we should be able to |
1116 | * poll the ERRE bit in EPCR to wait for the EEPROM | 1116 | * poll the ERRE bit in EPCR to wait for the EEPROM |
1117 | * operation. From testing several chips, this bit | 1117 | * operation. From testing several chips, this bit |
1118 | * does not seem to work. | 1118 | * does not seem to work. |
1119 | * | 1119 | * |
1120 | * We attempt to use the bit, but fall back to the | 1120 | * We attempt to use the bit, but fall back to the |
1121 | * timeout (which is why we do not return an error | 1121 | * timeout (which is why we do not return an error |