Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp6980843rwi; Mon, 24 Oct 2022 08:23:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM683Q6DzA+w2tVSbpwyilhqiCcDsXz7Nq7z2ehg7QJnLdZkyOtF9NbMDNtZP9jssfzq4SV/ X-Received: by 2002:a17:90a:4bca:b0:212:e3df:abfc with SMTP id u10-20020a17090a4bca00b00212e3dfabfcmr14409297pjl.242.1666624988273; Mon, 24 Oct 2022 08:23:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666624988; cv=none; d=google.com; s=arc-20160816; b=GxWkvViQPJnfxheTNkXAixRbyEE/zJA/vH+rQHRbG9AcWCNUOnJd5tvSySFrk4Af+T RWQf/RAPEmFt0BuqgTwKSFus4j00IZuNQKd4lfDMJDO+GtjRN+jFsUHLvslmozLycEnZ 4tz/l9g4dvWrKlM+rf9ocYnuZMv9SpnC9/r89hWyDpdtPOLEs/WNZkt3CWPau9GEsnrL gfo5cm9hsyDkWimHsaAOAhgNubUZfpO3kbe5AGUUWQMJx8KwabStk3VRpJAwtiQmay+f nwSVupfaAH64/CYJsb8RF6RhVSxrTceeH8c6Q1S0BGtgbIK4YeFkpOPD7RsefZF+aeNG ZcDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tDiC/1FKz+yYwWEf47h5v0Zegd17NngY4kGc/4YTfWo=; b=JOmS6iPs5pBdkeO9rrQ+E9aAMMCP4r8NY0X+F9HmeysAAIQ7TltWsSM4PdoYczai9I IMrcJPGLUKTACBOZ2PX0fv/5w1wiM0NjObKKXPfwnNML9AMaqV6kQpRr+rK6i3QkHa8d 4/5VsyVppWck+kCpv11SuLClvGgWPK2+DPCb4mE0V+o3bao5+TqD/YQ7pKpVBDEToNuy Ekso8KUcazj7SJg3rP2gu0hD2D6VoMUcdQQLMMkFGmYny7FU5xp+ee36CW8A+nEavlWq wXot/fy/7CzRr0XsS2lBl3e6sVIZ9zxu163aqf+G2OxjZQDO9sTPnR0OpHYkKhnCLAfi kWgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JcHVWpnO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a170902c9cc00b00186b945c0b7si680367pld.581.2022.10.24.08.22.55; Mon, 24 Oct 2022 08:23:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JcHVWpnO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233346AbiJXOQs (ORCPT + 99 others); Mon, 24 Oct 2022 10:16:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234928AbiJXOOM (ORCPT ); Mon, 24 Oct 2022 10:14:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83140C97CF; Mon, 24 Oct 2022 05:54:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1047E6121A; Mon, 24 Oct 2022 12:44:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2580DC433D7; Mon, 24 Oct 2022 12:44:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615465; bh=5T+uoGLoWBIVPX3mlIPuMZ7rB+zzNdQkaKpCPmZcVBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JcHVWpnOdTk6/fbl/naCYdUlZvx3GBPRX46fJuidV2wZgfpeVo3XN7ZSRmp2WdB/m +bf+sVJdtDR8yQcF/5MkYqKr7d8dv3DMf+UGF3HatWifaMnDCnWgoJiB8zI9R64Osv HXLE/jzcSg6vgAaiRSqO6z4/iyjWHcL/CdtFfbbY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Ulf Hansson , Sasha Levin Subject: [PATCH 5.15 232/530] mmc: au1xmmc: Fix an error handling path in au1xmmc_probe() Date: Mon, 24 Oct 2022 13:29:36 +0200 Message-Id: <20221024113055.584371745@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 From: Christophe JAILLET [ Upstream commit 5cbedf52608cc3cbc1c2a9a861fb671620427a20 ] If clk_prepare_enable() fails, there is no point in calling clk_disable_unprepare() in the error handling path. Move the out_clk label at the right place. Fixes: b6507596dfd6 ("MIPS: Alchemy: au1xmmc: use clk framework") Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/21d99886d07fa7fcbec74992657dabad98c935c4.1661412818.git.christophe.jaillet@wanadoo.fr Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/au1xmmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index 0acc237843f7..f5f9cb7a2da5 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -1095,8 +1095,9 @@ static int au1xmmc_probe(struct platform_device *pdev) if (host->platdata && host->platdata->cd_setup && !(mmc->caps & MMC_CAP_NEEDS_POLL)) host->platdata->cd_setup(mmc, 0); -out_clk: + clk_disable_unprepare(host->clk); +out_clk: clk_put(host->clk); out_irq: free_irq(host->irq, host); -- 2.35.1