From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB587C3A5A8 for ; Wed, 4 Sep 2019 16:07:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 723532087E for ; Wed, 4 Sep 2019 16:07:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567613220; bh=PAUG5iixFXxTPmQ6sxSR0YC0MClEKtce7SpzYuzozrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zdNqSWrij94nomLJE05TkB6UPgiYi8lzci9DC17e09AKrMrbnc49ejY1QERSLSICY FkrqoKdaNAC6IbP+9Qlzs8Re2Ear1K+HO92CkmKQmgW0c03LySfwleJkzalLC+z26s cNiTz9g3iaGahepmjfSJqcOSe6ESSw3/E7DFjQPI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732725AbfIDQG7 (ORCPT ); Wed, 4 Sep 2019 12:06:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:38000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733177AbfIDQCL (ORCPT ); Wed, 4 Sep 2019 12:02:11 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1042123711; Wed, 4 Sep 2019 16:02:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612930; bh=PAUG5iixFXxTPmQ6sxSR0YC0MClEKtce7SpzYuzozrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qt5YkeD7hRKbDTFY2WGIYjvbK2vBI5PLl/A1Tw0b8esIpO0KIDYE4Whmv6KKMmrnB T9B8HOfWMrwVA22ryRT168kVgTVCM5HXkorG/8M3kprp6F9sKbyMUOn2ZRmAuxfVjX 94jII+8+PHsf7NyiqUyuLgRktmvRGW1tanzjmUKY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: YueHaibing , Hulk Robot , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 31/36] amd-xgbe: Fix error path in xgbe_mod_init() Date: Wed, 4 Sep 2019 12:01:17 -0400 Message-Id: <20190904160122.4179-31-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904160122.4179-1-sashal@kernel.org> References: <20190904160122.4179-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: YueHaibing [ Upstream commit b6b4dc4c1fa7f1c99398e7dc85758049645e9588 ] In xgbe_mod_init(), we should do cleanup if some error occurs Reported-by: Hulk Robot Fixes: efbaa828330a ("amd-xgbe: Add support to handle device renaming") Fixes: 47f164deab22 ("amd-xgbe: Add PCI device support") Signed-off-by: YueHaibing Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c index e31d9d1fb6a66..e4e632e025d31 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c @@ -487,13 +487,19 @@ static int __init xgbe_mod_init(void) ret = xgbe_platform_init(); if (ret) - return ret; + goto err_platform_init; ret = xgbe_pci_init(); if (ret) - return ret; + goto err_pci_init; return 0; + +err_pci_init: + xgbe_platform_exit(); +err_platform_init: + unregister_netdevice_notifier(&xgbe_netdev_notifier); + return ret; } static void __exit xgbe_mod_exit(void) -- 2.20.1