Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3412117rwa; Tue, 23 Aug 2022 04:28:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR5T73ufwbuofkYMHpy4FSdBj0pwaqk14LmdIcPDlxSYA6DWjoX/k/NYQUtNAv3naJ51+ZYR X-Received: by 2002:a05:6402:5212:b0:446:6910:5549 with SMTP id s18-20020a056402521200b0044669105549mr3231910edd.345.1661254097506; Tue, 23 Aug 2022 04:28:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661254097; cv=none; d=google.com; s=arc-20160816; b=gcDQBIcN9++51Q6WARU0gCNPBwf8lROoTlws3ih8LWJ+QKsFANCLkzrlQQ+YhhxcoF hfe7FXR7QGTOnbHiboLByzcO6/zw/0FW4aGkCMoIpBXkhzFz2sclFKPxnj7kujFTUwun KSdQxNsFIVeAIeyTv78YXY+gTLgR4quFwKFfTDGhqDU8ssaI7bUJLl+KwmslS3++EWEz DkoRkkAZwl4tAvy/Vw31JAw4hR0kXLL8BmKpE5jWyFpvGh1luwCVLVmY3PmXaIhDyOde Vu0is0n3hRxkRK8LEVxg0ttZcHwLLtEVsO/rRTAEKn2KvZEr8ImOmEeagsSYYOUAibJW kynA== 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=N+lsdC/jL+4hT7wxrL6HF75sW5TQBx2KkPy8ZxcScqisFwJ7hnKW5yYFP38+lyghNs qen8MQOZGilNuzAXxc4CwmUl46HwtlFAVHHOcxL0TAIYgnHixoVAsY/aY9/Y/E/jOZtV t+OpgQfF6w7JxDY0y2whZh2Fkbu2xjQrM5eOfJOSU64aG5oa2WV+LT2E1TSsYFDewReV Fcl2LE5d+GK2WliYY3DEGulcxEwKGQnuQao88d0X+LOhKY6e1q5kARmNJp++u99tNheQ c3fVoYYik8q+MzkW9UADSa9t2lRF+4GB63U8UAhbhD6Xt8WO6v5fE2TxJPkLAldsq0U8 1W3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1jTi6qxB; 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 q20-20020a170906541400b0073d6b88fdc7si6887014ejo.738.2022.08.23.04.27.51; Tue, 23 Aug 2022 04:28:17 -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=1jTi6qxB; 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 S1351500AbiHWJht (ORCPT + 99 others); Tue, 23 Aug 2022 05:37:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351904AbiHWJgH (ORCPT ); Tue, 23 Aug 2022 05:36:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B153A98582; Tue, 23 Aug 2022 01:40: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 dfw.source.kernel.org (Postfix) with ESMTPS id D3F6961540; Tue, 23 Aug 2022 08:38:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2515C433C1; Tue, 23 Aug 2022 08:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661243936; bh=gAdVwi5b46D9uvxjWOaMgLJiK7BOtIW4GyeExVWcIaw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1jTi6qxBfb/OKD9rWDRX/5/IIJ9xt6CVY0zeW4zh+oRYrlGiw9MdynqsHmdhyUO/Y 7FFxL7uFfcboQbDLDDr94fgB2HoAsSHiy9iMpuh1Icir8P27BQKPJE13DwRVrtGkj5 98GuEV/1sVkgZZW+BfWyWILpr7W9/hLvlO6JbhVM= 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.15 011/244] mmc: pxamci: Fix another error handling path in pxamci_probe() Date: Tue, 23 Aug 2022 10:22:50 +0200 Message-Id: <20220823080059.464051090@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080059.091088642@linuxfoundation.org> References: <20220823080059.091088642@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;