mfd: rtsx_pcr: Disable interrupts before cancelling delayed works (73beb63d) · Commits · 戴 / test

This fixes a kernel panic when resuming from suspend to RAM. Without this fix an interrupt hits after the delayed work is canceled and thus requeues it. So we end up freeing an armed timer. Cc: stable@vger.kernel.org Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Signed-off-by:

Samuel Ortiz <sameo@linux.intel.com>

drivers/mfd/rtsx_pcr.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -1228,8 +1228,14 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)

		pcr->remove_pci = true;

		cancel_delayed_work(&pcr->carddet_work);
		cancel_delayed_work(&pcr->idle_work);
		/* Disable interrupts at the pcr level */
		spin_lock_irq(&pcr->lock);
		rtsx_pci_writel(pcr, RTSX_BIER, 0);
		pcr->bier = 0;
		spin_unlock_irq(&pcr->lock);

		cancel_delayed_work_sync(&pcr->carddet_work);
		cancel_delayed_work_sync(&pcr->idle_work);

		mfd_remove_devices(&pcidev->dev);

Admin message