| From 58efd2ff5b408eaa4bef94aaaa9bbeb0ec881c22 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 12 Jun 2021 07:39:51 +0200 |
| Subject: habanalabs: Fix an error handling path in 'hl_pci_probe()' |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit 3002f467a0b0a70aec01d9f446da4ac8c6fda10b ] |
| |
| 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: 2e5eda4681f9 ("habanalabs: PCIe Advanced Error Reporting support") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Reviewed-by: Oded Gabbay <ogabbay@kernel.org> |
| Signed-off-by: Oded Gabbay <ogabbay@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/misc/habanalabs/common/habanalabs_drv.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/misc/habanalabs/common/habanalabs_drv.c b/drivers/misc/habanalabs/common/habanalabs_drv.c |
| index 3bcef64a677a..ded92b3cbdb2 100644 |
| --- a/drivers/misc/habanalabs/common/habanalabs_drv.c |
| +++ b/drivers/misc/habanalabs/common/habanalabs_drv.c |
| @@ -421,6 +421,7 @@ static int hl_pci_probe(struct pci_dev *pdev, |
| return 0; |
| |
| disable_device: |
| + pci_disable_pcie_error_reporting(pdev); |
| pci_set_drvdata(pdev, NULL); |
| destroy_hdev(hdev); |
| |
| -- |
| 2.30.2 |
| |
