2020-05-23 03:07:18

by Qiushi Wu

Subject: [PATCH] RDMA: fix missing pci disable in pvrdma_pci_probe()

From: Qiushi Wu <[email protected]>

In function pvrdma_pci_probe(), pdev was not disabled in one error
path. Thus replace the jump target “err_free_device” by
"err_disable_pdev".

Fixes: 29c8d9eba550 ("IB: Add vmw_pvrdma driver")
Signed-off-by: Qiushi Wu <[email protected]>
---
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
index e580ae9cc55a..780fd2dfc07e 100644
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
@@ -829,7 +829,7 @@ static int pvrdma_pci_probe(struct pci_dev *pdev,
!(pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
dev_err(&pdev->dev, "PCI BAR region not MMIO\n");
ret = -ENOMEM;
- goto err_free_device;
+ goto err_disable_pdev;
}

ret = pci_request_regions(pdev, DRV_NAME);
--
2.17.1

2020-05-25 21:33:30

by Jason Gunthorpe

Subject: Re: [PATCH] RDMA: fix missing pci disable in pvrdma_pci_probe()

On Fri, May 22, 2020 at 10:04:57PM -0500, [email protected] wrote:
> From: Qiushi Wu <[email protected]>
>
> In function pvrdma_pci_probe(), pdev was not disabled in one error
> path. Thus replace the jump target “err_free_device” by
> "err_disable_pdev".
>
> Fixes: 29c8d9eba550 ("IB: Add vmw_pvrdma driver")
> Signed-off-by: Qiushi Wu <[email protected]>
> ---
> drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to for-next, thanks

Jason