projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
/spare/repo/libata-dev branch 'v2.6.13'
[powerpc.git]
/
drivers
/
net
/
tulip
/
media.c
diff --git
a/drivers/net/tulip/media.c
b/drivers/net/tulip/media.c
index
edae09a
..
e26c31f
100644
(file)
--- a/
drivers/net/tulip/media.c
+++ b/
drivers/net/tulip/media.c
@@
-174,6
+174,7
@@
void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val)
break;
}
spin_unlock_irqrestore(&tp->mii_lock, flags);
+ return;
}
/* Establish sync by sending 32 logic ones. */
@@
-399,6
+400,9
@@
void tulip_select_media(struct net_device *dev, int startup)
}
tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
+
+ mdelay(1);
+
return;
}