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>

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index 774918ca63d25d9b29ddfe35ccf68ea5fda31d23..019a158e1128d7a27cdbea269a9149bc90b364dd 100644 (file)
--- 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 d2ce28008fee4ee07b40558ed582f03cbb7a0d11..eca9688bf9d9fdff11ea091b9b2e3d9c115ab8e0 100644 (file)
--- 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);