From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: davem@davemloft.net, kuba@kernel.org
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
netdev@vger.kernel.org, anthony.l.nguyen@intel.com,
Sasha Neftin <sasha.neftin@intel.com>,
Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Subject: [PATCH net 08/11] e1000e: Fix an error handling path in 'e1000_probe()'
Date: Thu, 1 Jul 2021 11:04:17 -0700 [thread overview]
Message-ID: <20210701180420.346126-9-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20210701180420.346126-1-anthony.l.nguyen@intel.com>
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
If an error occurs after a 'pci_enable_pcie_error_reporting()' call, it
must be undone by a corresponding 'pci_disable_pcie_error_reporting()'
call, as already done in the remove function.
Fixes: 111b9dc5c981 ("e1000e: add aer support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index d150dade06cf..757a54c39eef 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -7664,6 +7664,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_ioremap:
free_netdev(netdev);
err_alloc_etherdev:
+ pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
--
2.26.2
next prev parent reply other threads:[~2021-07-01 18:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-01 18:04 [PATCH net 00/11][pull request] Intel Wired LAN Driver Updates 2021-07-01 Tony Nguyen
2021-07-01 18:04 ` [PATCH net 01/11] igc: Fix use-after-free error during reset Tony Nguyen
2021-07-01 18:04 ` [PATCH net 02/11] igb: " Tony Nguyen
2021-07-01 18:04 ` [PATCH net 03/11] igc: change default return of igc_read_phy_reg() Tony Nguyen
2021-07-01 18:04 ` [PATCH net 04/11] ixgbe: Fix an error handling path in 'ixgbe_probe()' Tony Nguyen
2021-07-01 18:04 ` [PATCH net 05/11] igc: Fix an error handling path in 'igc_probe()' Tony Nguyen
2021-07-01 18:04 ` [PATCH net 06/11] igb: Fix an error handling path in 'igb_probe()' Tony Nguyen
2021-07-01 18:04 ` [PATCH net 07/11] fm10k: Fix an error handling path in 'fm10k_probe()' Tony Nguyen
2021-07-01 18:04 ` Tony Nguyen [this message]
2021-07-01 18:04 ` [PATCH net 09/11] iavf: Fix an error handling path in 'iavf_probe()' Tony Nguyen
2021-07-01 18:04 ` [PATCH net 10/11] igb: Check if num of q_vectors is smaller than max before array access Tony Nguyen
2021-07-01 18:04 ` [PATCH net 11/11] igb: Fix position of assignment to *ring Tony Nguyen
2021-07-01 21:50 ` [PATCH net 00/11][pull request] Intel Wired LAN Driver Updates 2021-07-01 patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210701180420.346126-9-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@intel.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=davem@davemloft.net \
--cc=dvorax.fuxbrumer@linux.intel.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sasha.neftin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).