summaryrefslogtreecommitdiff
path: root/drivers/net/phy/fixed.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-02-13 04:51:26 +0300
committerDavid S. Miller <davem@davemloft.net>2008-02-13 04:51:26 +0300
commitb791dd3ed7bef989f268365e85800862e8ac756f (patch)
treecdad5dbc7abc845682759fc4687bde3f8d9fee4e /drivers/net/phy/fixed.c
parent96b5a46e2a72dc1829370c87053e0cd558d58bc0 (diff)
parent651be3a2ba95bc30fcb737985741736e63231cdf (diff)
downloadlinux-b791dd3ed7bef989f268365e85800862e8ac756f.tar.xz
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/phy/fixed.c')
-rw-r--r--drivers/net/phy/fixed.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 73b6d39ef6b0..ca9b040f9ad9 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -236,12 +236,12 @@ module_init(fixed_mdio_bus_init);
static void __exit fixed_mdio_bus_exit(void)
{
struct fixed_mdio_bus *fmb = &platform_fmb;
- struct fixed_phy *fp;
+ struct fixed_phy *fp, *tmp;
mdiobus_unregister(&fmb->mii_bus);
platform_device_unregister(pdev);
- list_for_each_entry(fp, &fmb->phys, node) {
+ list_for_each_entry_safe(fp, tmp, &fmb->phys, node) {
list_del(&fp->node);
kfree(fp);
}