From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Tue, 16 Jul 2013 12:10:46 +0000 (+0800)
Subject: ARM: OMAP: dma: fix error return code in omap_system_dma_probe()
X-Git-Tag: v3.12-rc1~118^2^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=94b1d617e3ba4e682b8c94b86b65049ed5c810d6;p=linux-2.6-block.git

ARM: OMAP: dma: fix error return code in omap_system_dma_probe()

Fix to return a negative error code from the 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/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 4d463ca6821f..037660633fa4 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2083,6 +2083,7 @@ static int omap_system_dma_probe(struct platform_device *pdev)
 		dma_irq = platform_get_irq_byname(pdev, irq_name);
 		if (dma_irq < 0) {
 			dev_err(&pdev->dev, "failed: request IRQ %d", dma_irq);
+			ret = dma_irq;
 			goto exit_dma_lch_fail;
 		}
 		ret = setup_irq(dma_irq, &omap24xx_dma_irq);