summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Goode <emilgoode@gmail.com>2014-05-19 15:07:54 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-11 12:03:23 -0700
commit6a93022f1d099b66b573aac243a4df890fd0a1c4 (patch)
treec9da1116c21a4b5a11f633ec1ffb17dbe0ef4ace
parentcaf3d430ba12e30567f20950b62faa51a264ca38 (diff)
downloadlwn-6a93022f1d099b66b573aac243a4df890fd0a1c4.tar.gz
lwn-6a93022f1d099b66b573aac243a4df890fd0a1c4.zip
ARM: imx: fix error handling in ipu device registration
commit d1d70e5dc2cfa9047bb935c41ba808ebb8135696 upstream. If we fail to allocate struct platform_device pdev we dereference it after the goto label err. This bug was found using coccinelle. Fixes: afa77ef (ARM: mx3: dynamically allocate "ipu-core" devices) Signed-off-by: Emil Goode <emilgoode@gmail.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/mach-imx/devices/platform-ipu-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/devices/platform-ipu-core.c b/arch/arm/mach-imx/devices/platform-ipu-core.c
index fc4dd7cedc11..6bd7c3f37ac0 100644
--- a/arch/arm/mach-imx/devices/platform-ipu-core.c
+++ b/arch/arm/mach-imx/devices/platform-ipu-core.c
@@ -77,7 +77,7 @@ struct platform_device *__init imx_alloc_mx3_camera(
pdev = platform_device_alloc("mx3-camera", 0);
if (!pdev)
- goto err;
+ return ERR_PTR(-ENOMEM);
pdev->dev.dma_mask = kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
if (!pdev->dev.dma_mask)