Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3411816rwa; Tue, 23 Aug 2022 04:27:56 -0700 (PDT) X-Google-Smtp-Source: AA6agR5QrOeA+SxTaCfbkuub2CWl+PE4mhAa8DW/y+TXkToH+VmzJxi3poAPS2PyqCa1Jn1x6qR4 X-Received: by 2002:a17:90b:224c:b0:1fb:4df6:8b5f with SMTP id hk12-20020a17090b224c00b001fb4df68b5fmr2898763pjb.167.1661254075422; Tue, 23 Aug 2022 04:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661254075; cv=none; d=google.com; s=arc-20160816; b=BgybNdaC3woFHJYUFFEavLZNomDTELBadbmSVvSR64/b8A914TlBHTpkYUAGT2IBUe IPKJqiFEkbMQAepRedNkSUoCs6Sj/YfnTJxC8tXKeuUGNnmRG5aZ70FiEIdi6UT/FftN IYU9jcGgtJcEvr8Ligz5nbrmNII+GLsFeha0ChACs+dZj2KeLdLAml6gVS2/VQSyAT9Q j3wfHX7Gd71eUBvL9ODqz8ht1IfQ88UR4OY9Ph/P2GcX2zs81b7swMfGRZghrmQMzYnJ 1GN2Cb1biWtibrRqWWHpedntnBDNLeI1A3RvItOVyo1y69DEqmrC5psBzFbjZnxWK0OW sjUw== 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=DGkoidUBLRYWbtV+FRJL5Xqs7m7wUgs2vSJ1XfNegdQ=; b=SDZlQxm3AltHohGwUdZfEcKxrcInT+wjzYNvfQ8S3euO3TQ1w7/hjPAlYnloSHsxFE mWqpEHG+M1r1sNEa7qeJwmtSZfx0S2aV7XyC+wjcxXYcG3CWBuIelgeCmdupZv8Z6go5 Ned3YzoI43nATZ3JGYwZENtR9lH/+1y8lLdV1b2oPMkwmUCdqgTmB8Fajp13bIdHjCND /O22Scjfsg2vipE/WuKOFyiuHUxUcqD5j9ezIjv8zGYuuEX4xHiPqdu1DHzj7EEjSdfN wFEpfh+fF61ZSFjLf9emRFqcPiulwpA6BrlBZ1DPLqItKSmew37qsQNlsBv47hJa5LZE FV2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sMbSg04T; 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 k10-20020a65464a000000b0041bc22f2e79si16147623pgr.6.2022.08.23.04.27.44; Tue, 23 Aug 2022 04:27:55 -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=sMbSg04T; 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 S1355876AbiHWKxV (ORCPT + 99 others); Tue, 23 Aug 2022 06:53:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355887AbiHWKp2 (ORCPT ); Tue, 23 Aug 2022 06:45:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EF2C6CF59; Tue, 23 Aug 2022 02:11:15 -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 19D6B60F54; Tue, 23 Aug 2022 09:11:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BD76C433D7; Tue, 23 Aug 2022 09:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661245874; bh=ltfQgSNyWjNYjljJhQLDIuB+VrweU0tvjkY1jwvjRzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sMbSg04TcRUYRGDFE8qapwH62jl6kB7Ek8ql2lEwo+U2m93GNKZ1fhICAu3yvVKLp vQuqSO5jUz6LxkTtdk8keqq4P6q2pLbppWdH6t7C7m45YA/wZg18MJf0l2f8gN70p7 tz7VJKhQz0w93Ce13rvVT0FPmGEYraEOmJNbt8nA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Ulf Hansson Subject: [PATCH 4.19 218/287] mmc: pxamci: Fix another error handling path in pxamci_probe() Date: Tue, 23 Aug 2022 10:26:27 +0200 Message-Id: <20220823080108.297829640@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080100.268827165@linuxfoundation.org> References: <20220823080100.268827165@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 @@ -677,7 +677,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;