diff options
| author | Kulikov Vasiliy <segooon@gmail.com> | 2010-07-08 23:43:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-08 23:43:20 -0700 |
| commit | 7cc36f6f7116918c8a8990a0f23f62d2288a81bf (patch) | |
| tree | c7acec6340939e016e01be98a88cb68b8e941a7b | |
| parent | 9f1e7582749980b51da67671b2536aadca3596b8 (diff) | |
| download | blackbird-op-linux-7cc36f6f7116918c8a8990a0f23f62d2288a81bf.tar.gz blackbird-op-linux-7cc36f6f7116918c8a8990a0f23f62d2288a81bf.zip | |
ll_temac: fix memory leak
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>
| -rw-r--r-- | drivers/net/ll_temac_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index b57d0ff52519..6ebf808bf440 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c @@ -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); |
