From patchwork Mon Apr 4 17:23:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 12800838 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4E04C3527B for ; Mon, 4 Apr 2022 21:28:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380531AbiDDVaW (ORCPT ); Mon, 4 Apr 2022 17:30:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379538AbiDDR0Z (ORCPT ); Mon, 4 Apr 2022 13:26:25 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4074D31909; Mon, 4 Apr 2022 10:24:27 -0700 (PDT) X-IronPort-AV: E=Sophos;i="5.90,234,1643641200"; d="scan'208";a="116711388" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 05 Apr 2022 02:24:27 +0900 Received: from localhost.localdomain (unknown [10.226.36.204]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 1149740B0B07; Tue, 5 Apr 2022 02:24:24 +0900 (JST) From: Lad Prabhakar To: Wolfram Sang , Ulf Hansson , Philipp Zabel , Yoshihiro Shimoda , linux-mmc@vger.kernel.org Cc: Pavel Machek , linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Lad Prabhakar Subject: [PATCH 1/2] mmc: renesas_sdhi: Jump to error path instead of returning directly Date: Mon, 4 Apr 2022 18:23:21 +0100 Message-Id: <20220404172322.32578-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220404172322.32578-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20220404172322.32578-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Jump to error path "edisclk" instead of returning directly in case of devm_reset_control_get_optional_exclusive() failure. Fixes: b4d86f37eacb7 ("mmc: renesas_sdhi: do hard reset if possible") Reported-by: Pavel Machek Signed-off-by: Lad Prabhakar --- drivers/mmc/host/renesas_sdhi_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index 2797a9c0f17d..cddb0185f5fb 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -1033,8 +1033,10 @@ int renesas_sdhi_probe(struct platform_device *pdev, goto efree; priv->rstc = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL); - if (IS_ERR(priv->rstc)) - return PTR_ERR(priv->rstc); + if (IS_ERR(priv->rstc)) { + ret = PTR_ERR(priv->rstc); + goto edisclk; + } ver = sd_ctrl_read16(host, CTL_VERSION); /* GEN2_SDR104 is first known SDHI to use 32bit block count */