Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3325226rwa; Tue, 23 Aug 2022 02:53:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR6NDpagABupthgKclTPFw6RnibOSWVo+aNLvwip1HlTB5f/IulAAyvg3SY7E0MBKSJKe5kF X-Received: by 2002:a17:90b:3c0a:b0:1fb:129a:a5eb with SMTP id pb10-20020a17090b3c0a00b001fb129aa5ebmr2453093pjb.94.1661248386193; Tue, 23 Aug 2022 02:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661248386; cv=none; d=google.com; s=arc-20160816; b=1KODypdlYlut+E4CUdJog715g76TnG2SCNy/rz+sM5+FOHtKYRv3lWViDt5NYH89zn AYoZVLD0sER6jSPtJ4Ia5V+Ry95EZKcJaT1gzWMeHAcuO8946YUNDK+3shedD9R9bSUJ vlRTDqT6goFewjpntrKskB8oobellcvNIyA2l3hh+P6ExeE28hing0uoSNch9OzlmW0N FJ2JPRkkZhSXYXdB1ETc/U37hvfOxnUBmnO0Oe6FMgfDpp6K8WtYZZN2nvR5JDMsAwy2 dYtS3a1cpUuaz25JM4ngoa9IJDU76v8CR8p3I+fdvqDVPpgewyTrOTEtwwmMeiNMiIlH CXKg== 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=NJiM4ZKxocQwfNo2VUiwzeHnu3AX7o35H6PCGQGg3Kc=; b=PEn+T2EluoSREOyHL2oYQ4jBDpM1HWKcC60pid6L+YdX9Oe8IozXyUXU+WaoePHVYY ksL2VLaQS1YnBYwwfUKtFLsOxL0MpoKQQCtQzrWBVkGoB5+KKOkSq55nZz5Au48JbG8a 2H2cJW75VLw4o3su2RD4RwWSl+gZKBC4HsY3k+UeQZD6h182kSNFnIYXNnqlsVLIFXf1 PkhWiBePbG/g8X9lAVnh7uoDx1L8Hx6Tgf2Md1o+PavBnuRx2ABzUeGuGxggl84Vn7Hk pBTJV/sQDIOPJYigGBWSj2eHjHFbV9QkJWXpMlUYQCeTkoEJd7eYmHGu7syohTryB1Ao FXgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=A33b7MDv; 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 na8-20020a17090b4c0800b001f537a6e47csi2931274pjb.7.2022.08.23.02.52.55; Tue, 23 Aug 2022 02:53:06 -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=A33b7MDv; 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 S1351312AbiHWJhQ (ORCPT + 99 others); Tue, 23 Aug 2022 05:37:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351627AbiHWJfu (ORCPT ); Tue, 23 Aug 2022 05:35:50 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34F7397D68; Tue, 23 Aug 2022 01:40:06 -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 BBF18B81C53; Tue, 23 Aug 2022 08:39:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5F55C433D6; Tue, 23 Aug 2022 08:39:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661243942; bh=XXnsT8YnvLr5n07bfMayojz6yEaBHQq9iwO02OlXMVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A33b7MDvfMlaL213tYjRk45mOGSPRu10aqT6gOC5d2ObWUgCRoYI6CETdVgd0LC8h YiXio5Es4m+Fxz/FAIknywRyb5YOq/MWVGg6x188Mp6GfhIvqe8JDdHvI/7y/r1WML aStylsF5wM3c3/k41VhGzDY6aYtphHQB0PTpL0ts= 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 012/244] mmc: pxamci: Fix an error handling path in pxamci_probe() Date: Tue, 23 Aug 2022 10:22:51 +0200 Message-Id: <20220823080059.492779138@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 98d7c5e5792b8ce3e1352196dac7f404bb1b46ec upstream. The commit in Fixes: has moved some code around without updating gotos to the error handling path. Update it now and release some resources if pxamci_of_init() fails. Fixes: fa3a5115469c ("mmc: pxamci: call mmc_of_parse()") Signed-off-by: Christophe JAILLET Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/6d75855ad4e2470e9ed99e0df21bc30f0c925a29.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 @@ -648,7 +648,7 @@ static int pxamci_probe(struct platform_ ret = pxamci_of_init(pdev, mmc); if (ret) - return ret; + goto out; host = mmc_priv(mmc); host->mmc = mmc;