Commit c43a5eb2 authored Jan 11, 2014 by Linus Torvalds

mfd-fixes

Pull MFD fix from Samuel Ortiz:
 "This is the 2nd MFD pull request for 3.13

  It only contains one fix for the rtsx_pcr driver.  Without it we see a
  kernel panic on some machines, when resuming from suspend to RAM"

* tag 'mfd-fixes-3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
  mfd: rtsx_pcr: Disable interrupts before cancelling delayed works

parents 21e20e22 73beb63d

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