|
@@ -1497,7 +1497,7 @@ static int pxa168_eth_probe(struct platform_device *pdev)
|
|
dev = alloc_etherdev(sizeof(struct pxa168_eth_private));
|
|
dev = alloc_etherdev(sizeof(struct pxa168_eth_private));
|
|
if (!dev) {
|
|
if (!dev) {
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|
|
- goto out;
|
|
|
|
|
|
+ goto err_clk;
|
|
}
|
|
}
|
|
|
|
|
|
platform_set_drvdata(pdev, dev);
|
|
platform_set_drvdata(pdev, dev);
|
|
@@ -1507,12 +1507,12 @@ static int pxa168_eth_probe(struct platform_device *pdev)
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (res == NULL) {
|
|
if (res == NULL) {
|
|
err = -ENODEV;
|
|
err = -ENODEV;
|
|
- goto out;
|
|
|
|
|
|
+ goto err_netdev;
|
|
}
|
|
}
|
|
pep->base = ioremap(res->start, res->end - res->start + 1);
|
|
pep->base = ioremap(res->start, res->end - res->start + 1);
|
|
if (pep->base == NULL) {
|
|
if (pep->base == NULL) {
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|
|
- goto out;
|
|
|
|
|
|
+ goto err_netdev;
|
|
}
|
|
}
|
|
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
|
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
|
BUG_ON(!res);
|
|
BUG_ON(!res);
|
|
@@ -1549,7 +1549,7 @@ static int pxa168_eth_probe(struct platform_device *pdev)
|
|
pep->smi_bus = mdiobus_alloc();
|
|
pep->smi_bus = mdiobus_alloc();
|
|
if (pep->smi_bus == NULL) {
|
|
if (pep->smi_bus == NULL) {
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|
|
- goto out;
|
|
|
|
|
|
+ goto err_base;
|
|
}
|
|
}
|
|
pep->smi_bus->priv = pep;
|
|
pep->smi_bus->priv = pep;
|
|
pep->smi_bus->name = "pxa168_eth smi";
|
|
pep->smi_bus->name = "pxa168_eth smi";
|
|
@@ -1558,31 +1558,31 @@ static int pxa168_eth_probe(struct platform_device *pdev)
|
|
snprintf(pep->smi_bus->id, MII_BUS_ID_SIZE, "%d", pdev->id);
|
|
snprintf(pep->smi_bus->id, MII_BUS_ID_SIZE, "%d", pdev->id);
|
|
pep->smi_bus->parent = &pdev->dev;
|
|
pep->smi_bus->parent = &pdev->dev;
|
|
pep->smi_bus->phy_mask = 0xffffffff;
|
|
pep->smi_bus->phy_mask = 0xffffffff;
|
|
- if (mdiobus_register(pep->smi_bus) < 0) {
|
|
|
|
- err = -ENOMEM;
|
|
|
|
- goto out;
|
|
|
|
- }
|
|
|
|
|
|
+ err = mdiobus_register(pep->smi_bus);
|
|
|
|
+ if (err)
|
|
|
|
+ goto err_free_mdio;
|
|
|
|
+
|
|
pxa168_init_hw(pep);
|
|
pxa168_init_hw(pep);
|
|
err = ethernet_phy_setup(dev);
|
|
err = ethernet_phy_setup(dev);
|
|
if (err)
|
|
if (err)
|
|
- goto out;
|
|
|
|
|
|
+ goto err_mdiobus;
|
|
SET_NETDEV_DEV(dev, &pdev->dev);
|
|
SET_NETDEV_DEV(dev, &pdev->dev);
|
|
err = register_netdev(dev);
|
|
err = register_netdev(dev);
|
|
if (err)
|
|
if (err)
|
|
- goto out;
|
|
|
|
|
|
+ goto err_mdiobus;
|
|
return 0;
|
|
return 0;
|
|
-out:
|
|
|
|
- if (pep->clk) {
|
|
|
|
- clk_disable(pep->clk);
|
|
|
|
- clk_put(pep->clk);
|
|
|
|
- pep->clk = NULL;
|
|
|
|
- }
|
|
|
|
- if (pep->base) {
|
|
|
|
- iounmap(pep->base);
|
|
|
|
- pep->base = NULL;
|
|
|
|
- }
|
|
|
|
- if (dev)
|
|
|
|
- free_netdev(dev);
|
|
|
|
|
|
+
|
|
|
|
+err_mdiobus:
|
|
|
|
+ mdiobus_unregister(pep->smi_bus);
|
|
|
|
+err_free_mdio:
|
|
|
|
+ mdiobus_free(pep->smi_bus);
|
|
|
|
+err_base:
|
|
|
|
+ iounmap(pep->base);
|
|
|
|
+err_netdev:
|
|
|
|
+ free_netdev(dev);
|
|
|
|
+err_clk:
|
|
|
|
+ clk_disable(clk);
|
|
|
|
+ clk_put(clk);
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
|
|
|