diff options
| author | Stefan Roese <sr@denx.de> | 2007-09-02 14:02:19 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-09-02 14:02:19 +0200 |
| commit | 1d1ab638f8b5961e4972d29394e573afb39667be (patch) | |
| tree | 36fa9e8b01e05323e93a55a2cdc592fe69b5396c /drivers/dm9000x.c | |
| parent | 81b73dec16fd1227369a191e725e10044a9d56b8 (diff) | |
| parent | 60174746c668b309378a91488dded898e9553eae (diff) | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'drivers/dm9000x.c')
| -rw-r--r-- | drivers/dm9000x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dm9000x.c b/drivers/dm9000x.c index 78acb097ef..e0d531bd91 100644 --- a/drivers/dm9000x.c +++ b/drivers/dm9000x.c @@ -303,8 +303,8 @@ eth_init(bd_t * bd) for (i = 0; i < 6; i++) ((u16 *) bd->bi_enetaddr)[i] = read_srom_word(i); - if (!is_zero_ether_addr(bd->bi_enetaddr) && - !is_mutlicast_ether_addr(bd->bi_enetaddr)) { + if (is_zero_ether_addr(bd->bi_enetaddr) || + is_multicast_ether_addr(bd->bi_enetaddr)) { /* try reading from environment */ u8 i; char *s, *e; @@ -542,7 +542,7 @@ read_srom_word(int offset) { DM9000_iow(DM9000_EPAR, offset); DM9000_iow(DM9000_EPCR, 0x4); - udelay(200); + udelay(8000); DM9000_iow(DM9000_EPCR, 0x0); return (DM9000_ior(DM9000_EPDRL) + (DM9000_ior(DM9000_EPDRH) << 8)); } |