aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-15 12:04:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-15 12:04:08 -0800
commitdb1b2d323f7914452db5a7071e75f3d159ac6e5d (patch)
tree91833dcec867304736481076eabf315267c8b4f4
parent7ea76ebba9adf4b72e0e43045447da50d7fc7bd6 (diff)
parent249bfb83cf8ba658955f0245ac3981d941f746ee (diff)
Merge tag '3.8-pci-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas: "This is another fix for v3.8. It fixes an oops that happens when a Thunderbolt adapter is unplugged (remove device, poll for PME events on no-longer-existing device, oops)." * tag '3.8-pci-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI/PM: Clean up PME state when removing a device
-rw-r--r--drivers/pci/remove.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 7c0fd9252e6..84954a726a9 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -19,6 +19,8 @@ static void pci_free_resources(struct pci_dev *dev)
static void pci_stop_dev(struct pci_dev *dev)
{
+ pci_pme_active(dev, false);
+
if (dev->is_added) {
pci_proc_detach_device(dev);
pci_remove_sysfs_dev_files(dev);