| Message ID | 1278591006-3156-1-git-send-email-segooon@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Jul 8, 2010 at 6:10 AM, Kulikov Vasiliy <segooon@gmail.com> wrote: > If of_iomap() or irq_of_parse_and_map() fail then np must be freed. > > Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Looks correct to me. g. > --- > 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 5bca20b..a2da3d7 100644 > --- a/drivers/net/ll_temac_main.c > +++ b/drivers/net/ll_temac_main.c > @@ -999,19 +999,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); > -- > 1.7.0.4 > >
From: Kulikov Vasiliy <segooon@gmail.com> Date: Thu, 8 Jul 2010 16:10:03 +0400 > If of_iomap() or irq_of_parse_and_map() fail then np must be freed. > > Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index 5bca20b..a2da3d7 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c @@ -999,19 +999,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);
If of_iomap() or irq_of_parse_and_map() fail then np must be freed. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> --- drivers/net/ll_temac_main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)