Commit dfe1e8ed authored by Denis Kirjanov's avatar Denis Kirjanov Committed by David S. Miller

ll_temac: Fix missing iounmaps

Fix missing iounmaps.
Signed-off-by: default avatarDenis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17762060
...@@ -964,7 +964,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) ...@@ -964,7 +964,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
np = of_parse_phandle(op->dev.of_node, "llink-connected", 0); np = of_parse_phandle(op->dev.of_node, "llink-connected", 0);
if (!np) { if (!np) {
dev_err(&op->dev, "could not find DMA node\n"); dev_err(&op->dev, "could not find DMA node\n");
goto nodev; goto err_iounmap;
} }
/* Setup the DMA register accesses, could be DCR or memory mapped */ /* Setup the DMA register accesses, could be DCR or memory mapped */
...@@ -978,7 +978,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) ...@@ -978,7 +978,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
dev_dbg(&op->dev, "MEM base: %p\n", lp->sdma_regs); dev_dbg(&op->dev, "MEM base: %p\n", lp->sdma_regs);
} else { } else {
dev_err(&op->dev, "unable to map DMA registers\n"); dev_err(&op->dev, "unable to map DMA registers\n");
goto nodev; goto err_iounmap;
} }
} }
...@@ -987,7 +987,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) ...@@ -987,7 +987,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) { if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) {
dev_err(&op->dev, "could not determine irqs\n"); dev_err(&op->dev, "could not determine irqs\n");
rc = -ENOMEM; rc = -ENOMEM;
goto nodev; goto err_iounmap_2;
} }
of_node_put(np); /* Finished with the DMA node; drop the reference */ of_node_put(np); /* Finished with the DMA node; drop the reference */
...@@ -997,7 +997,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) ...@@ -997,7 +997,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
if ((!addr) || (size != 6)) { if ((!addr) || (size != 6)) {
dev_err(&op->dev, "could not find MAC address\n"); dev_err(&op->dev, "could not find MAC address\n");
rc = -ENODEV; rc = -ENODEV;
goto nodev; goto err_iounmap_2;
} }
temac_set_mac_address(ndev, (void *)addr); temac_set_mac_address(ndev, (void *)addr);
...@@ -1013,7 +1013,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) ...@@ -1013,7 +1013,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
rc = sysfs_create_group(&lp->dev->kobj, &temac_attr_group); rc = sysfs_create_group(&lp->dev->kobj, &temac_attr_group);
if (rc) { if (rc) {
dev_err(lp->dev, "Error creating sysfs files\n"); dev_err(lp->dev, "Error creating sysfs files\n");
goto nodev; goto err_iounmap_2;
} }
rc = register_netdev(lp->ndev); rc = register_netdev(lp->ndev);
...@@ -1026,6 +1026,11 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) ...@@ -1026,6 +1026,11 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
err_register_ndev: err_register_ndev:
sysfs_remove_group(&lp->dev->kobj, &temac_attr_group); sysfs_remove_group(&lp->dev->kobj, &temac_attr_group);
err_iounmap_2:
if (lp->sdma_regs)
iounmap(lp->sdma_regs);
err_iounmap:
iounmap(lp->regs);
nodev: nodev:
free_netdev(ndev); free_netdev(ndev);
ndev = NULL; ndev = NULL;
...@@ -1044,6 +1049,9 @@ static int __devexit temac_of_remove(struct of_device *op) ...@@ -1044,6 +1049,9 @@ static int __devexit temac_of_remove(struct of_device *op)
of_node_put(lp->phy_node); of_node_put(lp->phy_node);
lp->phy_node = NULL; lp->phy_node = NULL;
dev_set_drvdata(&op->dev, NULL); dev_set_drvdata(&op->dev, NULL);
iounmap(lp->regs);
if (lp->sdma_regs)
iounmap(lp->sdma_regs);
free_netdev(ndev); free_netdev(ndev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment