From patchwork Tue Jul 16 12:10:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2828100 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EEEF69F7D6 for ; Tue, 16 Jul 2013 12:11:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D33B2201C6 for ; Tue, 16 Jul 2013 12:11:28 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 65D9720177 for ; Tue, 16 Jul 2013 12:11:27 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uz46E-000210-V2; Tue, 16 Jul 2013 12:11:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uz46C-0002Ab-PG; Tue, 16 Jul 2013 12:11:20 +0000 Received: from mail-bk0-x229.google.com ([2a00:1450:4008:c01::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uz467-00029t-Uq for linux-arm-kernel@lists.infradead.org; Tue, 16 Jul 2013 12:11:18 +0000 Received: by mail-bk0-f41.google.com with SMTP id jc3so228809bkc.14 for ; Tue, 16 Jul 2013 05:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=d6sU60d3bQhVg7oz6TboEj6EkTgs+jTb8zm9ILTyudI=; b=CswE17diCdnFtbs6iCBFgU7kpNuuL460/7HHzNvtB9UV4ztFdZ+eh80cjSQzGyVleF f/KcE84piG3vWLj5CtPJt+jwFt5Sza708EVJH1wTt14o2R3lxeif7gEDjvwrqh2fbS/k AK8Apv4bgGLagjm1CJMqE0CATE0QLIqxXMdsn5tabkpnmsGd1iEvhYh55ndrx33aW5Rc SUl0LYrE5LZr4yHJwyySJRXbWKIKAMm3LhLx9SBbnjxfIkOiwQ+QdGKLJXo34yTJsrVc yVET0lMdmuRh/sHTPIDe0XmwGITVz5xHC0DVPcft6NYzmqv5HAV+VY24ky85Iga+1KzV gIkA== MIME-Version: 1.0 X-Received: by 10.204.189.80 with SMTP id dd16mr226611bkb.126.1373976646276; Tue, 16 Jul 2013 05:10:46 -0700 (PDT) Received: by 10.205.122.72 with HTTP; Tue, 16 Jul 2013 05:10:46 -0700 (PDT) Date: Tue, 16 Jul 2013 20:10:46 +0800 Message-ID: Subject: [PATCH] ARM: OMAP: dma: fix error return code in omap_system_dma_probe() From: Wei Yongjun To: tony@atomide.com, linux@arm.linux.org.uk X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130716_081116_162676_A081CEB3 X-CRM114-Status: UNSURE ( 9.44 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: yongjun_wei@trendmicro.com.cn, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun 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 --- arch/arm/plat-omap/dma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 4d463ca..0376606 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);