diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2019-09-12 18:49:56 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-09-13 22:59:51 +0300 |
| commit | 75c66515e4fea4e9bb488b6125e014220f846c61 (patch) | |
| tree | a7a79ca9a05da74fd3fd74b1c8c3e1cb2901c167 /drivers/net/ethernet/freescale/enetc/enetc_ptp.c | |
| parent | 1ba7c8f800586805c409f5b1ff1803318a41933a (diff) | |
| parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
| download | linux-75c66515e4fea4e9bb488b6125e014220f846c61.tar.xz | |
Merge tag 'v5.3-rc8' into rdma.git for-next
To resolve dependencies in following patches
mlx5_ib.h conflict resolved by keeing both hunks
Linux 5.3-rc8
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/enetc/enetc_ptp.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c index 2fd2586e42bf..bc594892507a 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c @@ -82,7 +82,7 @@ static int enetc_ptp_probe(struct pci_dev *pdev, n = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSIX); if (n != 1) { err = -EPERM; - goto err_irq; + goto err_irq_vectors; } ptp_qoriq->irq = pci_irq_vector(pdev, 0); @@ -107,6 +107,8 @@ static int enetc_ptp_probe(struct pci_dev *pdev, err_no_clock: free_irq(ptp_qoriq->irq, ptp_qoriq); err_irq: + pci_free_irq_vectors(pdev); +err_irq_vectors: iounmap(base); err_ioremap: kfree(ptp_qoriq); @@ -125,6 +127,7 @@ static void enetc_ptp_remove(struct pci_dev *pdev) enetc_phc_index = -1; ptp_qoriq_free(ptp_qoriq); + pci_free_irq_vectors(pdev); kfree(ptp_qoriq); pci_release_mem_regions(pdev); |