]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ll_temac: fix memory leak
authorKulikov Vasiliy <segooon@gmail.com>
Fri, 9 Jul 2010 06:43:20 +0000 (23:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Jul 2010 06:43:20 +0000 (23:43 -0700)
If of_iomap() or irq_of_parse_and_map() fail then np must be freed.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ll_temac_main.c

index b57d0ff5251935a6b6e353fdba298002f3ad0033..6ebf808bf440cb43bae1032f4d1e512a9dc090bd 100644 (file)
@@ -1031,19 +1031,22 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
                        dev_dbg(&op->dev, "MEM base: %p\n", lp->sdma_regs);
                } else {
                        dev_err(&op->dev, "unable to map DMA registers\n");
+                       of_node_put(np);
                        goto err_iounmap;
                }
        }
 
        lp->rx_irq = irq_of_parse_and_map(np, 0);
        lp->tx_irq = irq_of_parse_and_map(np, 1);
+
+       of_node_put(np); /* Finished with the DMA node; drop the reference */
+
        if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) {
                dev_err(&op->dev, "could not determine irqs\n");
                rc = -ENOMEM;
                goto err_iounmap_2;
        }
 
-       of_node_put(np); /* Finished with the DMA node; drop the reference */
 
        /* Retrieve the MAC address */
        addr = of_get_property(op->dev.of_node, "local-mac-address", &size);