aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-05-16 11:25:07 -0700
committerTony Lindgren <tony@atomide.com>2013-05-16 11:25:07 -0700
commita8b09c52a66e801d87704cfebf57958b1991ab86 (patch)
treec61fe921b9f864f79d99bcdba70d86ec673149e7 /arch
parentARM: OMAP: fix __init section mismatch for _enable_preprogram (diff)
downloadlinux-dev-a8b09c52a66e801d87704cfebf57958b1991ab86.tar.xz
linux-dev-a8b09c52a66e801d87704cfebf57958b1991ab86.zip
ARM: OMAP: fix error return code in omap1_system_dma_init()
Fix to return -ENOMEM in the d->chan alloc error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap1/dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 68ab858e27b7..a94b3a718d1a 100644
--- a/arch/arm/mach-omap1/dma.c
+++ b/arch/arm/mach-omap1/dma.c
@@ -345,6 +345,7 @@ static int __init omap1_system_dma_init(void)
dev_err(&pdev->dev,
"%s: Memory allocation failed for d->chan!\n",
__func__);
+ ret = -ENOMEM;
goto exit_release_d;
}