From patchwork Mon May 13 04:25:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2556181 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 895B93FC5A for ; Mon, 13 May 2013 04:25:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750902Ab3EMEZZ (ORCPT ); Mon, 13 May 2013 00:25:25 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:46307 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750763Ab3EMEZY (ORCPT ); Mon, 13 May 2013 00:25:24 -0400 Received: by mail-wi0-f176.google.com with SMTP id hr14so2467333wib.3 for ; Sun, 12 May 2013 21:25:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=fbyqodSV3v4KnF57AJ7fpu8fN2WelVPrOQEmPljYwhU=; b=rM0YcseZ1md6Yqllc9pPU9MFy2aSOOavT+7Llyk8f4wLQfEao3AX9c7B3lRrqwlVAO sJXtw9qJ466tI1KfpvX8yb1nkDgC/lb+/uhXxSqba2pp46cKU+0u+EvJ8GuVjcPDdWJb 46fZzhpB178BHTgILHp8Vpy2IHWdnDWV7OO5q2zhnEE5jdgTkYAMwLtsJg/OupxGwTQ2 EdvgRTbbNEeUTLqFBelZe9q6dJAWmxNXGldv90u9HkNbwPEY+dAi0ZwTET/Zt4NRZ0vH FvFbetCl7gej9qZQlWmfeqGzh9oLUA8lYSDybfHwUgTjWSpyJ8Sv3EsVhJaiADlXTvRl D4gQ== MIME-Version: 1.0 X-Received: by 10.204.168.201 with SMTP id v9mr4970396bky.116.1368419123201; Sun, 12 May 2013 21:25:23 -0700 (PDT) Received: by 10.204.199.129 with HTTP; Sun, 12 May 2013 21:25:23 -0700 (PDT) Date: Mon, 13 May 2013 12:25:23 +0800 Message-ID: Subject: [PATCH] ARM: OMAP: fix error return code in omap1_system_dma_init() From: Wei Yongjun To: tony@atomide.com, linux@arm.linux.org.uk Cc: yongjun_wei@trendmicro.com.cn, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Wei Yongjun 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 --- arch/arm/mach-omap1/dma.c | 1 + 1 file changed, 1 insertion(+) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }