aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLothar Waßmann <LW@KARO-electronics.de>2010-12-15 16:11:31 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-01 08:19:55 -0500
commit84082d665dc62e632e21213fda8b22c0b8c25b81 (patch)
tree478052614c02a2f512a2a6ce5a71fab8fd83bc6c /arch
parent8c3f2d7a2df5b3ad020571cacb1824f8df4768fd (diff)
ARM: mxs: free dma_mask in error path
This fixes a small memory leak that was only hit in very unlikely error paths. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mxs/devices.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/devices.c b/arch/arm/mach-mxs/devices.c
index c20d54740b0b..cfdb6b284702 100644
--- a/arch/arm/mach-mxs/devices.c
+++ b/arch/arm/mach-mxs/devices.c
@@ -66,6 +66,8 @@ struct platform_device *__init mxs_add_platform_device_dmamask(
66 ret = platform_device_add(pdev); 66 ret = platform_device_add(pdev);
67 if (ret) { 67 if (ret) {
68err: 68err:
69 if (dmamask)
70 kfree(pdev->dev.dma_mask);
69 platform_device_put(pdev); 71 platform_device_put(pdev);
70 return ERR_PTR(ret); 72 return ERR_PTR(ret);
71 } 73 }