From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 16 May 2013 18:25:07 +0000 (-0700)
Subject: ARM: OMAP: fix error return code in omap1_system_dma_init()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8b09c52a66e801d87704cfebf57958b1991ab86;p=linux-beck.git

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>
---

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;
 	}