diff options
| author |   Julia Lawall <julia@diku.dk> | 2010-08-29 11:52:42 +0200 |
|---|---|---|
| committer |   David Woodhouse <David.Woodhouse@intel.com> | 2010-10-24 23:40:22 +0100 |
| commit | cf363518ca44d654c51497b3f73c69a34565155d (patch) | |
| tree | 692db693c4c2d7eb80815af3dd30a10e23669209 /drivers/mtd/nand/mpc5121_nfc.c | |
| parent | mtd: pxa3xx_nand: set oob length in the runtime (diff) | |
| download | linux-dev-cf363518ca44d654c51497b3f73c69a34565155d.tar.xz linux-dev-cf363518ca44d654c51497b3f73c69a34565155d.zip | |
mtd: mpc5121_nfc: fix memory leak on error path
Add a call to of_node_put in the error handling code following a call to
of_find_compatible_node.
Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/mtd/nand/mpc5121_nfc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index df0c1da4ff49..f4610bc7ccd0 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c @@ -568,6 +568,7 @@ static int mpc5121_nfc_read_hw_config(struct mtd_info *mtd) uint rcw_width; uint rcwh; uint romloc, ps; + int ret = 0; rmnode = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-reset"); if (!rmnode) { @@ -579,7 +580,8 @@ static int mpc5121_nfc_read_hw_config(struct mtd_info *mtd) rm = of_iomap(rmnode, 0); if (!rm) { dev_err(prv->dev, "Error mapping reset module node!\n"); - return -EBUSY; + ret = -EBUSY; + goto out; } rcwh = in_be32(&rm->rcwhr); @@ -628,8 +630,9 @@ static int mpc5121_nfc_read_hw_config(struct mtd_info *mtd) rcw_width * 8, rcw_pagesize, rcw_sparesize); iounmap(rm); +out: of_node_put(rmnode); - return 0; + return ret; } /* Free driver resources */ |