Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3512014rwa; Tue, 23 Aug 2022 06:04:47 -0700 (PDT) X-Google-Smtp-Source: AA6agR44PZRD+d+wBp/BZGUi0e4hwc/sHJrFv0VH1eDHB9VDWHaRsPyThTjF2aYymeBgqTCOCliA X-Received: by 2002:a17:903:31c9:b0:16c:3024:69c4 with SMTP id v9-20020a17090331c900b0016c302469c4mr24299867ple.81.1661259887490; Tue, 23 Aug 2022 06:04:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661259887; cv=none; d=google.com; s=arc-20160816; b=nDcYragDA0iTdcXOQcS7CC9KG/sY+NIPn/ofMvoe7W0O3eSHsAF+OlmwM565Zdt4hv XuUQLsL/4KdlllWNKKTvprFlR+1LJUcSN3xoMvue5Wet+qvVdP0+iWyVc/TJLha0vWu2 LGaGU6/kSy1kjlroK97nRUJburvbGNn2rKGbY/w88tWyqpfpCMi/dvgtSymAcJIGukjX 1+yrbkbVFYTQ+ru2nNBjg0Vd5RP2ie8iuntcZMVrYJIXIBcHo9qgl/YTv5qTVIeUVEsw oYbLBu5R5hpeTL4VCsO7ap4r0DapcvwU2TFVt3zi7xV0OXo7URHDOJwC3Vz0sXpQs4o0 VBtA== 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=ZkoNMoGPQTPRCogrG7jndhOu0x5h/73+BpRUJ2JBbsc=; b=pBcIOTrML6F4OCSbBmbllgNa5VwKCX0WrXUGxPP0QQ1kuv1JztBGww0cgxf7hnc5Md 7O5WcYjf0eiLn8zcWCHDbzyT0xzViP4X4rqu5tDZgJMTs0iyq/Hphot6lQYAr6wYbPG8 IoiOtXGYkra/fv0fum0/Wzg2qAFC59VqECrYxH2HdhVLDaCVjrnRnB2lvjCIeAg9IBOC QHpl5VBGNveM7USE7BXAGg2PmYDdEEYzceElJMP5F/JSOSdju7SVjvZ4smCiuYoVYGN4 GvYn5hvHvRGMow9Er0tyDEEQNatqUn/R0uFPUaaxkCGfSqM7xCeL/lRAVgTR+nfcmL8d 6kVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="idYZ/f8k"; 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 na10-20020a17090b4c0a00b001ecf6b6f350si17423173pjb.42.2022.08.23.06.04.21; Tue, 23 Aug 2022 06:04:47 -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="idYZ/f8k"; 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 S1358184AbiHWLs6 (ORCPT + 99 others); Tue, 23 Aug 2022 07:48:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358483AbiHWLqX (ORCPT ); Tue, 23 Aug 2022 07:46:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4915BD21FA; Tue, 23 Aug 2022 02:30:18 -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 ams.source.kernel.org (Postfix) with ESMTPS id 27B2DB81C85; Tue, 23 Aug 2022 09:30:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F20CC433D6; Tue, 23 Aug 2022 09:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661247008; bh=gAdVwi5b46D9uvxjWOaMgLJiK7BOtIW4GyeExVWcIaw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=idYZ/f8kyhp9lNtZD/jq9JKx7vR1jjbf2Tr8yuIxU0NDe4fIXjkXIBytNKd+5Dl+g bgM91kqDhSZGmSFxBxJlxdCNkUrelAqVqN/6F1DJ6AopydMMU3BNc6g7jP82keH0Ek z6rosMrgVYEbTnl1hY25fGVmSjgFhJLaMT52lFTY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Ulf Hansson Subject: [PATCH 5.4 289/389] mmc: pxamci: Fix another error handling path in pxamci_probe() Date: Tue, 23 Aug 2022 10:26:07 +0200 Message-Id: <20220823080127.624558985@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080115.331990024@linuxfoundation.org> References: <20220823080115.331990024@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.1 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,T_SCC_BODY_TEXT_LINE 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 commit b886f54c300d31c109d2e4336b22922b64e7ba7d upstream. The commit in Fixes: has introduced an new error handling without branching to the existing error handling path. Update it now and release some resources if pxamci_init_ocr() fails. Fixes: 61951fd6cb49 ("mmc: pxamci: let mmc core handle regulators") Signed-off-by: Christophe JAILLET Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/07a2dcebf8ede69b484103de8f9df043f158cffd.1658862932.git.christophe.jaillet@wanadoo.fr Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/pxamci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -672,7 +672,7 @@ static int pxamci_probe(struct platform_ ret = pxamci_init_ocr(host); if (ret < 0) - return ret; + goto out; mmc->caps = 0; host->cmdat = 0;