2021-06-12 05:44:10

by Christophe JAILLET

Subject: [PATCH] habanalabs: Fix an error handling path in 'hl_pci_probe()'

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 <[email protected]>
---
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 64d1530db985..d15b912a347b 100644
--- a/drivers/misc/habanalabs/common/habanalabs_drv.c
+++ b/drivers/misc/habanalabs/common/habanalabs_drv.c
@@ -464,6 +464,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

2021-06-14 08:53:17

by Oded Gabbay

Subject: Re: [PATCH] habanalabs: Fix an error handling path in 'hl_pci_probe()'

On Sat, Jun 12, 2021 at 8:42 AM Christophe JAILLET
<[email protected]> wrote:
>
> 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 <[email protected]>
> ---
> 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 64d1530db985..d15b912a347b 100644
> --- a/drivers/misc/habanalabs/common/habanalabs_drv.c
> +++ b/drivers/misc/habanalabs/common/habanalabs_drv.c
> @@ -464,6 +464,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
>

Thanks for catching it.
This patch is:
Reviewed-by: Oded Gabbay <[email protected]>

Applied to -next.
Oded