diff mbox

ARM: OMAP: fix error return code in omap1_system_dma_init()

Message ID CAPgLHd8iPa4efHsYsCmGE-j-GzZw7DtWdSaQqpEuF60-BRtmbg@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Yongjun May 13, 2013, 4:25 a.m. UTC 
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

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>
---
 arch/arm/mach-omap1/dma.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Tony Lindgren May 16, 2013, 5:48 p.m. UTC | #1 
* Wei Yongjun <weiyj.lk@gmail.com> [130512 21:30]:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> 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>

Thanks, applying into omap-for-v3.10/fixes.

Regards,

Tony

> ---
>  arch/arm/mach-omap1/dma.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
> index 68ab858..a94b3a7 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;
>  	}
>  
>
diff mbox

Patch

diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 68ab858..a94b3a7 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;
 	}