Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp432423iob; Wed, 18 May 2022 05:30:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPHIS/kOVPxLy54u/fHsByBTv9WvDlhDVAPhFXvYYfEmS+1BnVW35qY+8DjYOE3ARpAp4a X-Received: by 2002:a17:90b:3d0b:b0:1dc:1953:462d with SMTP id pt11-20020a17090b3d0b00b001dc1953462dmr30468395pjb.122.1652877014540; Wed, 18 May 2022 05:30:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652877014; cv=none; d=google.com; s=arc-20160816; b=rt0M52oyioFIhDtppgulMNRxnz/JkYvKwh+VKlisnpdUU2ZWr7nMtM286DkuDkp/ZF hRoD2aBNCp+FVkUDz21RLyQkiZSEvgTM6U1G0TE9aXp/bPr77N/36KVMHjyPCqcR6JBB GHf3bjwaAkAJUobJZWTSkCiGtSOlCS7pAAbUZnLIe2UXv5A+29UD5hKjCC1UbsDKw94M lZkdNIFlsHMeNuL/IkgvhFNuR0c+m+LRm/B2HxRg5UrWHNGKOghqnGghmiuRfFJDzbyc giCvkpa1umcWEfFOw/ABqXeGV8tmqZYJsbP728UBO4KPjLoVjziaBhJLd5PLCx2pqZr/ OZxw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=D5UkE1u2N8HXCyrzbuNpE7Kw9oHKi67sbRmVPE0Y4ho=; b=oEKV71IjBAU+FJ3kFQcUm1xcAfjBzE8qYGHlGdyFlzUbuZlj+hN2xNn5sax1uzaT0z QJ+Tk+mBVwYo6JUZvBdFWWHv9H4Ey+M1nHEro4QiuzBOSxzn4MFY+gztBC+qt9tbWUc5 e+gWKTx5affuTrJwLkz1r6XL7Ms+wkU4Ln9icWAvkkdPRoWW2VlCANZ0GXquwlVm6zm9 cAH4c+N5V0iD+9GXLzFd8EdvgDi2+1zXnrydFtQz75xkH93LvLt4ccvzsCdnM8wvIgLx 2MaKMt+tvx0DFhnbpM1MD6lwoIStp79dkysfIqwRZSxy5uL5LTgXB/9Aue9uZr4PNhPE Nr8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hnC4SkjN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id c5-20020a634e05000000b0039db476db86si2469519pgb.453.2022.05.18.05.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 05:30:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hnC4SkjN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BDFEA1912DB; Wed, 18 May 2022 05:29:53 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236505AbiERM2V (ORCPT + 99 others); Wed, 18 May 2022 08:28:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236587AbiERM1e (ORCPT ); Wed, 18 May 2022 08:27:34 -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 23D70BA9B5; Wed, 18 May 2022 05:27:33 -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 A5CC06147D; Wed, 18 May 2022 12:27:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5161AC34100; Wed, 18 May 2022 12:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652876852; bh=CjDagl7s1yUewHYXWMFrzcpaB6LIIM2ZSZMxbuBP6VU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hnC4SkjNnasn60+AMYnP+GabZRdRbbhXyBiudAEKnIT3Il/cnGrVK7x76SD6EuDAb kAM1/hxRcUNDEvAMNMdAb/X54hC6qgHTCEIUmfVbo8M3bJvnWeqotAk6xMB6NXDmex Apu2alnli9TMqn/ZIWIrMOSc1t65XfkRT6rtZ5CpDpI444/prtbAiHMxRx329PgWZL tbLqHmBOv5tTRJ8z26tYJ3ZSFPl/UFOnp3KaiihLJbexYdSvhySNcfEomnWxNEdctH XXF07ivaBJ6HC/11fQ1y+gyS1g4qQAa3ubNcKAb7F1T6WO7Y+X5SOo2UhaGiQcoYjJ ghaB7t7WzeJKQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Yingliang , Hulk Robot , Jakub Kicinski , Sasha Levin , peppe.cavallaro@st.com, alexandre.torgue@foss.st.com, joabreu@synopsys.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, mcoquelin.stm32@gmail.com, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.17 17/23] net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe() Date: Wed, 18 May 2022 08:26:30 -0400 Message-Id: <20220518122641.342120-17-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220518122641.342120-1-sashal@kernel.org> References: <20220518122641.342120-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: Yang Yingliang [ Upstream commit 0807ce0b010418a191e0e4009803b2d74c3245d5 ] Switch to using pcim_enable_device() to avoid missing pci_disable_device(). Reported-by: Hulk Robot Signed-off-by: Yang Yingliang Link: https://lore.kernel.org/r/20220510031316.1780409-1-yangyingliang@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index fcf17d8a0494..644bb54f5f02 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -181,7 +181,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev, return -ENOMEM; /* Enable pci device */ - ret = pci_enable_device(pdev); + ret = pcim_enable_device(pdev); if (ret) { dev_err(&pdev->dev, "%s: ERROR: failed to enable device\n", __func__); @@ -241,8 +241,6 @@ static void stmmac_pci_remove(struct pci_dev *pdev) pcim_iounmap_regions(pdev, BIT(i)); break; } - - pci_disable_device(pdev); } static int __maybe_unused stmmac_pci_suspend(struct device *dev) -- 2.35.1