| Message ID | cd1027c125c3c098c59fa3c612e6bf617aa77dc9.1484859556.git.aditr@vmware.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Jan 19, 2017 at 01:20:40PM -0800, Adit Ranadive wrote: > If the interrupt allocation failed we should start freeing the CQ rings > rather than unregistering the netdev notifier. > > Fixes: 29c8d9eba550 ("IB: Add vmw_pvrdma driver") > Signed-off-by: Adit Ranadive <aditr@vmware.com> > --- > drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c > index 231a1ce..bd8fbd3 100644 > --- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c > +++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c > @@ -1029,7 +1029,7 @@ static int pvrdma_pci_probe(struct pci_dev *pdev, > if (ret) { > dev_err(&pdev->dev, "failed to allocate interrupts\n"); > ret = -ENOMEM; > - goto err_netdevice; > + goto err_free_cq_ring; > } > > /* Allocate UAR table. */ > @@ -1092,8 +1092,6 @@ static int pvrdma_pci_probe(struct pci_dev *pdev, > err_free_intrs: > pvrdma_free_irq(dev); > pvrdma_disable_msi_all(dev); > -err_netdevice: > - unregister_netdevice_notifier(&dev->nb_netdev); > err_free_cq_ring: > pvrdma_page_dir_cleanup(dev, &dev->cq_pdir); > err_free_async_ring: Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com> > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c index 231a1ce..bd8fbd3 100644 --- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c +++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c @@ -1029,7 +1029,7 @@ static int pvrdma_pci_probe(struct pci_dev *pdev, if (ret) { dev_err(&pdev->dev, "failed to allocate interrupts\n"); ret = -ENOMEM; - goto err_netdevice; + goto err_free_cq_ring; } /* Allocate UAR table. */ @@ -1092,8 +1092,6 @@ static int pvrdma_pci_probe(struct pci_dev *pdev, err_free_intrs: pvrdma_free_irq(dev); pvrdma_disable_msi_all(dev); -err_netdevice: - unregister_netdevice_notifier(&dev->nb_netdev); err_free_cq_ring: pvrdma_page_dir_cleanup(dev, &dev->cq_pdir); err_free_async_ring:
If the interrupt allocation failed we should start freeing the CQ rings rather than unregistering the netdev notifier. Fixes: 29c8d9eba550 ("IB: Add vmw_pvrdma driver") Signed-off-by: Adit Ranadive <aditr@vmware.com> --- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)