summaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip/media.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-26 23:11:03 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-26 23:11:03 +0200
commit8b0ee07e108b2eefdab5bb73f33223f18926c3b2 (patch)
treef68ca04180c5488301a40ec212ef2eb2467cf56c /drivers/net/tulip/media.c
parent[PATCH] smc91c92_cs: Reduce stack usage in smc91c92_event() (diff)
parentMerge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-8b0ee07e108b2eefdab5bb73f33223f18926c3b2.tar.xz
linux-8b0ee07e108b2eefdab5bb73f33223f18926c3b2.zip
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
Diffstat (limited to 'drivers/net/tulip/media.c')
-rw-r--r--drivers/net/tulip/media.c1
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)
break;
}
spin_unlock_irqrestore(&tp->mii_lock, flags);
+ return;
}
/* Establish sync by sending 32 logic ones. */