lkml.org 
[lkml]   [2014]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] ARM: imx: add missing kfree call in error paths
Date
We forgot to free pdev->dev.dma_mask as it is not freed
by platform_device_put().

Signed-off-by: Emil Goode <emilgoode@gmail.com>
---
arch/arm/mach-imx/mach-mx31_3ds.c | 4 +++-
arch/arm/mach-imx/mach-mx31moboard.c | 4 +++-
arch/arm/mach-imx/mach-mx35_3ds.c | 4 +++-
arch/arm/mach-imx/mach-pcm037.c | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 453f41a..8de1019 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -201,9 +201,11 @@ static int __init mx31_3ds_init_camera(void)
goto err;

ret = platform_device_add(pdev);
- if (ret)
+ if (ret) {
err:
+ kfree(pdev->dev.dma_mask);
platform_device_put(pdev);
+ }

return ret;
}
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index 6bed570..f24a93c 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -494,9 +494,11 @@ static int __init mx31moboard_init_cam(void)
goto err;

ret = platform_device_add(pdev);
- if (ret)
+ if (ret) {
err:
+ kfree(pdev->dev.dma_mask);
platform_device_put(pdev);
+ }

return ret;

diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c
index 72cd77d..ffdddb3 100644
--- a/arch/arm/mach-imx/mach-mx35_3ds.c
+++ b/arch/arm/mach-imx/mach-mx35_3ds.c
@@ -284,9 +284,11 @@ static int __init imx35_3ds_init_camera(void)
goto err;

ret = platform_device_add(pdev);
- if (ret)
+ if (ret) {
err:
+ kfree(pdev->dev.dma_mask);
platform_device_put(pdev);
+ }

return ret;
}
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c
index 8eb1570..764a111 100644
--- a/arch/arm/mach-imx/mach-pcm037.c
+++ b/arch/arm/mach-imx/mach-pcm037.c
@@ -427,9 +427,11 @@ static int __init pcm037_init_camera(void)
goto err;

ret = platform_device_add(pdev);
- if (ret)
+ if (ret) {
err:
+ kfree(pdev->dev.dma_mask);
platform_device_put(pdev);
+ }

return ret;
}
--
1.7.10.4


\
 
 \ /
  Last update: 2014-05-22 15:41    [W:0.206 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site