diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2016-12-19 06:52:55 +0100 |
|---|---|---|
| committer | Jon Mason <jdmason@kudzu.us> | 2016-12-23 16:11:03 -0500 |
| commit | 28734e8f69395de4c2aea50fcb74d87720e8537b (patch) | |
| tree | aa670cdfd9d1b9909eef2050938c68691c6b152e /drivers/ntb/hw | |
| parent | 09e71a6f13445974fe9b70b6d4b68ac362cd68b6 (diff) | |
| download | linux-stable-28734e8f69395de4c2aea50fcb74d87720e8537b.tar.gz linux-stable-28734e8f69395de4c2aea50fcb74d87720e8537b.tar.bz2 linux-stable-28734e8f69395de4c2aea50fcb74d87720e8537b.zip | |
NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy
'request_irq()' and 'free_irq()' should have the same 'dev_id'.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'drivers/ntb/hw')
| -rw-r--r-- | drivers/ntb/hw/amd/ntb_hw_amd.c | 2 | ||||
| -rw-r--r-- | drivers/ntb/hw/intel/ntb_hw_intel.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c index 774918ca63d2..019a158e1128 100644 --- a/drivers/ntb/hw/amd/ntb_hw_amd.c +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c @@ -599,7 +599,7 @@ static int ndev_init_isr(struct amd_ntb_dev *ndev, err_msix_request: while (i-- > 0) - free_irq(ndev->msix[i].vector, ndev); + free_irq(ndev->msix[i].vector, &ndev->vec[i]); pci_disable_msix(pdev); err_msix_enable: kfree(ndev->msix); diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c index d2ce28008fee..eca9688bf9d9 100644 --- a/drivers/ntb/hw/intel/ntb_hw_intel.c +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c @@ -494,7 +494,7 @@ static int ndev_init_isr(struct intel_ntb_dev *ndev, err_msix_request: while (i-- > 0) - free_irq(ndev->msix[i].vector, ndev); + free_irq(ndev->msix[i].vector, &ndev->vec[i]); pci_disable_msix(pdev); err_msix_enable: kfree(ndev->msix); |