linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: OMAP: fix error return code in omap1_system_dma_init()
@ 2013-05-13  4:25 Wei Yongjun
  2013-05-16 17:48 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-05-13  4:25 UTC (permalink / raw)
  To: linux-arm-kernel

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(+)

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH] ARM: OMAP: fix error return code in omap1_system_dma_init()
  2013-05-13  4:25 [PATCH] ARM: OMAP: fix error return code in omap1_system_dma_init() Wei Yongjun
@ 2013-05-16 17:48 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2013-05-16 17:48 UTC (permalink / raw)
  To: linux-arm-kernel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-05-16 17:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-13  4:25 [PATCH] ARM: OMAP: fix error return code in omap1_system_dma_init() Wei Yongjun
2013-05-16 17:48 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).