From patchwork Wed Mar 21 19:27:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 10300175 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C5C6C60386 for ; Wed, 21 Mar 2018 19:28:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE25929060 for ; Wed, 21 Mar 2018 19:28:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A28F729071; Wed, 21 Mar 2018 19:28:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE71729060 for ; Wed, 21 Mar 2018 19:28:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753357AbeCUT2q (ORCPT ); Wed, 21 Mar 2018 15:28:46 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:46763 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752982AbeCUT2n (ORCPT ); Wed, 21 Mar 2018 15:28:43 -0400 Received: by mail-qt0-f195.google.com with SMTP id h4so6489918qtn.13 for ; Wed, 21 Mar 2018 12:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4zS8DuZCgSWAbMqUw73qy9vbhinaH2w0oSvOpcS3KjU=; b=rD24ludYE203WwX8pEHi+vlQl2HVuf5AU8fl4MnL1Tf4jxVJ1+uEX1wiNSQCFxfB3v cjDgq0+iTAlTlp6LXh29D4VkHX0d7YWPeZfaCLvYFxve9Dore06lUQ6kYLGc3BuQmyOL dFYEOxvfLCK6gUYiBMUrPFjD0dWgbYLKPLcDgVChnmcY2RRjKdWt9zSIdDxCc94ICFnd DNhjOUVmdE41+SIcldCBZqSvsg+Q/VP1/+IB9qjLK+d5Cq13Bm1v7FMlma26PsNxZr+X mniU9+YJ78dFZUBbkyYHOBl76z0E9y/W4Y5YNi3jWsuLL//Tkw8hRXIjU3NF61NKILpb if/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4zS8DuZCgSWAbMqUw73qy9vbhinaH2w0oSvOpcS3KjU=; b=UPE83WujBdueA/kDO713rCTb6nNdve61c4NUnRBRngv/3xE2jK5AWKtFYI5r3R2Pn9 +pDdgFESG7wH3IgCUmYTjtHLyrcDyz+Ff3zr9/SFffZen2nJu4w0Xn2LTK+jhVcq/V9S t+Ki6KmfrQPhUiTFv0Ed5nTn+cBMT0OUNYZ98U4KmVNEHVytNff9vWHz0yG4JkCqttS+ D45Ksj+SMiyZygRCa6srho8CKRFrGKoKIsv3Cc5BwnoFEmKtSC3eYH1FIpZH6PuARkbS tg7mmN/IIhMvxTn4MZ6hJ5GVz2mB3qDlul9DaMvxFSAposqDnIygrYg30esjlAgQTkxQ POIA== X-Gm-Message-State: AElRT7HWREk1ra+5lFzI0UKDIPKH6LUMgEXjzIiAZ7lEmZ51XNXeJRTD FcWresBP8y0aN8ktKdF0F6AQ1XMH X-Google-Smtp-Source: AG47ELtjk1A9DJVHGH7+R8ywXQzRvGpOvUFDb1Ml3ev0ZLnLIj5Tv4mKDp4edu9H8H5QGUyxgd7nXg== X-Received: by 10.237.47.165 with SMTP id m34mr32168820qtd.178.1521660522198; Wed, 21 Mar 2018 12:28:42 -0700 (PDT) Received: from localhost.localdomain ([190.210.56.45]) by smtp.gmail.com with ESMTPSA id h184sm3859601qkc.78.2018.03.21.12.28.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 12:28:41 -0700 (PDT) From: Ezequiel Garcia To: Mathieu Malaterre , Ulf Hansson , Paul Cercueil Cc: linux-mmc@vger.kernel.org, linux-mips@linux-mips.org, James Hogan , kernel@collabora.com, Ezequiel Garcia Subject: [PATCH 02/14] mmc: jz4740: Fix error exit path in driver's probe Date: Wed, 21 Mar 2018 16:27:29 -0300 Message-Id: <20180321192741.25872-3-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180321192741.25872-1-ezequiel@vanguardiasur.com.ar> References: <20180321192741.25872-1-ezequiel@vanguardiasur.com.ar> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paul Cercueil Currently, if jz4740_mmc_request_gpios() fails, the driver tries to release DMA resources. This is wrong because DMA is requested at a later stage. Signed-off-by: Paul Cercueil [Ezequiel: cleanup commit message] Tested-by: Mathieu Malaterre Signed-off-by: Ezequiel Garcia --- drivers/mmc/host/jz4740_mmc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index a0168e9e4fce..97727cd34fc1 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -1006,7 +1006,7 @@ static int jz4740_mmc_probe(struct platform_device* pdev) ret = jz4740_mmc_request_gpios(mmc, pdev); if (ret) - goto err_release_dma; + goto err_free_host; mmc->ops = &jz4740_mmc_ops; mmc->f_min = JZ_MMC_CLK_RATE / 128; @@ -1038,16 +1038,17 @@ static int jz4740_mmc_probe(struct platform_device* pdev) jz4740_mmc_clock_disable(host); timer_setup(&host->timeout_timer, jz4740_mmc_timeout, 0); - host->use_dma = true; - if (host->use_dma && jz4740_mmc_acquire_dma_channels(host) != 0) - host->use_dma = false; + ret = jz4740_mmc_acquire_dma_channels(host); + if (ret == -EPROBE_DEFER) + goto err_free_irq; + host->use_dma = !ret; platform_set_drvdata(pdev, host); ret = mmc_add_host(mmc); if (ret) { dev_err(&pdev->dev, "Failed to add mmc host: %d\n", ret); - goto err_free_irq; + goto err_release_dma; } dev_info(&pdev->dev, "JZ SD/MMC card driver registered\n"); @@ -1057,13 +1058,13 @@ static int jz4740_mmc_probe(struct platform_device* pdev) return 0; +err_release_dma: + if (host->use_dma) + jz4740_mmc_release_dma_channels(host); err_free_irq: free_irq(host->irq, host); err_free_gpios: jz4740_mmc_free_gpios(pdev); -err_release_dma: - if (host->use_dma) - jz4740_mmc_release_dma_channels(host); err_free_host: mmc_free_host(mmc);