On Mon, Dec 19, 2016 at 10:04:24AM -0700, Dave Jiang wrote: > > > On 12/18/2016 10:52 PM, Christophe JAILLET wrote: > > 'request_irq()' and 'free_irq()' should have the same 'dev_id'. > > > > Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> > > Acking the Intel driver portion. > Acked-by: Dave Jiang <dave.jiang@xxxxxxxxx> Applied to the ntb git branch Thanks, Jon > > > --- > > drivers/ntb/hw/amd/ntb_hw_amd.c | 2 +- > > 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 6ccba0d862df..a48c3e085eab 100644 > > --- a/drivers/ntb/hw/amd/ntb_hw_amd.c > > +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c > > @@ -598,7 +598,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 7310a261c858..2413600aae30 100644 > > --- a/drivers/ntb/hw/intel/ntb_hw_intel.c > > +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c > > @@ -472,7 +472,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); > > > > -- > You received this message because you are subscribed to the Google Groups "linux-ntb" group. > To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@xxxxxxxxxxxxxxxx. > To post to this group, send email to linux-ntb@xxxxxxxxxxxxxxxx. > To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/56b16dd5-b83b-e8b0-bf79-2dd2bc56f1e1%40intel.com. > For more options, visit https://groups.google.com/d/optout. -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
