Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp3540132pxb; Mon, 4 Apr 2022 20:30:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2HeBdoAvyemLeB0Ysg2TkVPK8AqCJ8x1O5gEOvML7u5yR+UAtRXihsXsOwo2z/9uB3I41 X-Received: by 2002:a17:902:ab5c:b0:156:8913:ced4 with SMTP id ij28-20020a170902ab5c00b001568913ced4mr1283124plb.39.1649129430669; Mon, 04 Apr 2022 20:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649129430; cv=none; d=google.com; s=arc-20160816; b=rSnyzYiIJM4wIKofsl9FepLmXLy+2UkQNoNkKrecX5fRV6zD8gRCi805LJgDG93Z5J NJNfwnqYBl2o59gp+1IKzvW9qS3usS8OTyeZOuarJggTQGlWrGdeQizysa4bc5paRM1S DhiYSO/Ov9XpJKCFjgpBfquUF6ovNPujAM+MiTWop0Rdm745fhHeYIWtmANh7+uO+x/7 OB7sS5O9lUECH1SBk5+/jjC1iVT/ucB68m6EzTtI9HbdhZD4jypb7v5huCXCszFylWHb OOgLsZBZVsgv4zDrS16PucxoQHsofm9QKK7jKP2tTfLV561D8CJ5U7v5Bv7BDb6OB2+w yHvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=WBLY+R2Ev8wO5q4MhD3mDQFUZ3MHvKUIZjS38Lq8Odk=; b=ArPxpM+H62NZ7a7r8ptY9J/ofZgYhSe+xFZ/jlMyOuKc1MonYCpHu5ZhfrdOYV36JH 4C1Kr5wsGbpU24n1V+PCzCjxvyvViVHimERWprGFVh3tWOxvEVcXVVlWnr9/aWU1h7Ym JSFB6zcfWrIxhGv3e0+wlqVSapb1e8yPgIiTqeiTGoo3B1t0QJxhxQ2UsKrl2vQaHagJ G8O1sxtaDthiCt1yqsIulSp92hre8S0xPNCVBHrvGnyXIVOjx5rdym9YJcmqmxvjfzrU 2XiUI8E0uUmmLPGuAib26MoFYbPHu56DTBfcvxYlU0oUhw3/QXxffiPWZGl0iZc3ZqEa DDpw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id bh8-20020a056a02020800b003993e747980si3055546pgb.559.2022.04.04.20.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 20:30:30 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 271D835150C; Mon, 4 Apr 2022 18:29:37 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1387080AbiDDVkR (ORCPT + 99 others); Mon, 4 Apr 2022 17:40:17 -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> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 */ -- 2.17.1