From patchwork Mon Mar 12 21:55:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 10277551 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 71E1A602C2 for ; Mon, 12 Mar 2018 21:59:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E16428BA9 for ; Mon, 12 Mar 2018 21:59:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 506C828BA8; Mon, 12 Mar 2018 21:59:16 +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 9E05528BA8 for ; Mon, 12 Mar 2018 21:59:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751323AbeCLV7P (ORCPT ); Mon, 12 Mar 2018 17:59:15 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:43096 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751312AbeCLV7O (ORCPT ); Mon, 12 Mar 2018 17:59:14 -0400 Received: by mail-qk0-f194.google.com with SMTP id j4so13244666qke.10 for ; Mon, 12 Mar 2018 14:59:14 -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=O2XKyuYEZToOpksBcDvVYE9L8PY5xm2fXa831q0mosGVHXkF6Uir54046ccPxb0sGX eM6TfCRNmtFXSyR9x+vShVU058wKbwmmkz9HO1px90FbuMlKS0HrsS1h/LmwF/vTOj96 e76wAfG6zTy7cMtBnNI7Tf8d0V4y9wyjUs2y32/J21KLnLXeRY+W/WZhfCk5jqAEarsx uhYckusTXvyWpcBL2PHp9n1KtemM4FESmC79tpwbeAAZoCzEZr9BWoID3IbQog95irtx UH1VQWvRmdFiLKxxFOVimzdxASl8MiJ9uGq/2U1x/CRbv1uySDTiNIFzPJQ5/m+qfZCn mP3Q== 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=slusq7AL0rNISzsW5rcle8MJxAklbBKWeRX4hnM7SYwXRsecGtiHk3NUKaN5n89NLX 1nDlUMbfx15EIUsLs5Eh31/q2Uk2Ue8ZO2rAxiVhGxEfJ1MuRTeKe3uABosaRoh7Dqzb UolH+u86BObsIqaoT6wvuwYTTPt4EURovUjPSk+qAi1xHgW9oM1TRYoDXuThixmlr6ID YFJVIQMB8hA0kNgTgVMBdVArmTjbsRS/S+Qa0RhvDs3JNE4ZS4s72OaUNPMngv18VxF6 WWHjUUw3Qc3vbWw/pWjWD01lYlPyMN5gkUnEzhTSj4cg5ZqPiIlvvwjldFt9/WNmQ0Jo 4IrQ== X-Gm-Message-State: AElRT7EIFKOH6GQRQl+dqLOUWa0WcXQwJgfwJeJO3BXcrjdeG/mMICbC mqOc6F9j2oEzYxq2z360SEkG2ez1 X-Google-Smtp-Source: AG47ELsW6CaTEkGWzCKaxJwPopdRPk6/RmwzYlrcx18MWLt/wrA3l9Df9kZojXvMfsD1BrcoffmSGA== X-Received: by 10.55.175.6 with SMTP id y6mr14113641qke.32.1520891953827; Mon, 12 Mar 2018 14:59:13 -0700 (PDT) Received: from localhost.localdomain ([190.210.56.45]) by smtp.gmail.com with ESMTPSA id c5sm2756961qkf.93.2018.03.12.14.59.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Mar 2018 14:59:13 -0700 (PDT) From: Ezequiel Garcia To: Ulf Hansson , Paul Cercueil Cc: linux-mmc@vger.kernel.org, linux-mips@linux-mips.org, James Hogan , Ezequiel Garcia Subject: [PATCH v2 02/14] mmc: jz4740: Fix error exit path in driver's probe Date: Mon, 12 Mar 2018 18:55:42 -0300 Message-Id: <20180312215554.20770-3-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180312215554.20770-1-ezequiel@vanguardiasur.com.ar> References: <20180312215554.20770-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);