Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mfd-fixes-3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/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
+8
-2
+8
-2
drivers/mfd/rtsx_pcr.c
+8
-2
drivers/mfd/rtsx_pcr.c
···
1228
1228
1229
1229
pcr->remove_pci = true;
1230
1230
1231
-
cancel_delayed_work(&pcr->carddet_work);
1232
-
cancel_delayed_work(&pcr->idle_work);
1231
+
/* Disable interrupts at the pcr level */
1232
+
spin_lock_irq(&pcr->lock);
1233
+
rtsx_pci_writel(pcr, RTSX_BIER, 0);
1234
+
pcr->bier = 0;
1235
+
spin_unlock_irq(&pcr->lock);
1236
+
1237
+
cancel_delayed_work_sync(&pcr->carddet_work);
1238
+
cancel_delayed_work_sync(&pcr->idle_work);
1233
1239
1234
1240
mfd_remove_devices(&pcidev->dev);
1235
1241