From: Christophe JAILLET Date: Mon, 19 Dec 2016 05:52:55 +0000 (+0100) Subject: NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy X-Git-Tag: v4.14-rc1~1782^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28734e8f69395de4c2aea50fcb74d87720e8537b;p=platform%2Fkernel%2Flinux-rpi3.git NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy 'request_irq()' and 'free_irq()' should have the same 'dev_id'. Signed-off-by: Christophe JAILLET Acked-by: Dave Jiang Signed-off-by: Jon Mason --- diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c index 774918c..019a158 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 d2ce280..eca9688 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);