pata_efar: fix PIO2 underclocking

[safe/jmp/linux-2.6] / drivers / net / fs_enet / mii-fec.c

diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index 695f74c..28077cc 100644 (file)
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -128,7 +128,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
        struct fec_info *fec;
        int ret = -ENOMEM, i;
 
-       new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);
+       new_bus = mdiobus_alloc();
        if (!new_bus)
                goto out;
 
@@ -172,7 +172,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
                if (!strcmp(np->type, "ethernet-phy"))
                        add_phy(new_bus, np);
 
-       new_bus->dev = &ofdev->dev;
+       new_bus->parent = &ofdev->dev;
        dev_set_drvdata(&ofdev->dev, new_bus);
 
        ret = mdiobus_register(new_bus);
@@ -190,7 +190,7 @@ out_res:
 out_fec:
        kfree(fec);
 out_mii:
-       kfree(new_bus);
+       mdiobus_free(new_bus);
 out:
        return ret;
 }
@@ -205,7 +205,7 @@ static int fs_enet_mdio_remove(struct of_device *ofdev)
        kfree(bus->irq);
        iounmap(fec->fecp);
        kfree(fec);
-       kfree(bus);
+       mdiobus_free(bus);
 
        return 0;
 }