Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1357bf0c authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Greg Kroah-Hartman
Browse files

i2c: designware-pci: Fix BUG_ON during device removal 



commit 9be8bc4dd6177cf992b93b0bd014c4f611283896 upstream.

Function i2c_dw_pci_remove() -> pci_free_irq_vectors() ->
pci_disable_msi() -> free_msi_irqs() will throw a BUG_ON() for MSI
enabled device since the driver has not released the requested IRQ before
calling the pci_free_irq_vectors().

Here driver requests an IRQ using devm_request_irq() but automatic
release happens only after remove callback. Fix this by explicitly
freeing the IRQ before calling pci_free_irq_vectors().

Fixes: 21aa3983 ("i2c: designware-pci: Switch over to MSI interrupts")
Cc: stable@vger.kernel.org # v5.4+
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 849233b7

drivers/i2c/busses/i2c-designware-pcidrv.c

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev) 
	pm_runtime_get_noresume(&pdev->dev);



	i2c_del_adapter(&dev->adapter);

	devm_free_irq(&pdev->dev, dev->irq, dev);

	pci_free_irq_vectors(pdev);

}