| From 86f7e714e37301896d425fa8b8fb5dcd88e4f7a9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 16 Jun 2021 07:05:53 +0200 |
| Subject: e1000e: Fix an error handling path in 'e1000_probe()' |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit 4589075608420bc49fcef6e98279324bf2bb91ae ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 dc0ded7e5e61..86b7778dc9b4 100644 |
| --- a/drivers/net/ethernet/intel/e1000e/netdev.c |
| +++ b/drivers/net/ethernet/intel/e1000e/netdev.c |
| @@ -7664,6 +7664,7 @@ err_flashmap: |
| 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.30.2 |
| |
