diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-25 17:01:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-25 17:01:50 -0400 |
| commit | 1b981021e88c8c28dc6a22cb1a327d8dc9296473 (patch) | |
| tree | 5eeefa658d7f9c13cd352994805ac3ead628b7e9 /drivers/net/tulip/media.c | |
| parent | 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5 (diff) | |
| parent | f6f3a488e56783836a0b6ca9188719a1229f505c (diff) | |
Merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tulip/media.c')
| -rw-r--r-- | drivers/net/tulip/media.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c index edae09a4b021..919c40cd635c 100644 --- 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) | |||
| 174 | break; | 174 | break; |
| 175 | } | 175 | } |
| 176 | spin_unlock_irqrestore(&tp->mii_lock, flags); | 176 | spin_unlock_irqrestore(&tp->mii_lock, flags); |
| 177 | return; | ||
| 177 | } | 178 | } |
| 178 | 179 | ||
| 179 | /* Establish sync by sending 32 logic ones. */ | 180 | /* Establish sync by sending 32 logic ones. */ |