| From 02c18bb10279a1fe46803aad46f08b5d0f2f3ede Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 16 Jun 2021 07:00:36 +0200 |
| Subject: fm10k: Fix an error handling path in 'fm10k_probe()' |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit e85e14d68f517ef12a5fb8123fff65526b35b6cd ] |
| |
| 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: 19ae1b3fb99c ("fm10k: Add support for PCI power management and error handling") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c |
| index 9e3103fae723..caedf24c24c1 100644 |
| --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c |
| +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c |
| @@ -2227,6 +2227,7 @@ err_sw_init: |
| err_ioremap: |
| free_netdev(netdev); |
| err_alloc_netdev: |
| + pci_disable_pcie_error_reporting(pdev); |
| pci_release_mem_regions(pdev); |
| err_pci_reg: |
| err_dma: |
| -- |
| 2.30.2 |
| |
