diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-13 00:42:36 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-13 00:42:36 +0400 |
| commit | 20f24208f631141bafe57ce5bcc8f2e7f3c41aae (patch) | |
| tree | 6220d9be56bb9e8dd1154f34905671fbf06d35b1 /drivers/pci/pci.c | |
| parent | f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c (diff) | |
| parent | 82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765 (diff) | |
| download | linux-20f24208f631141bafe57ce5bcc8f2e7f3c41aae.tar.xz | |
Merge branch 'pci/konstantin-runtime-pm' into next
* pci/konstantin-runtime-pm:
PCI/PM: Clear state_saved during suspend
PCI: Use atomic_inc_return() rather than atomic_add_return()
PCI: Catch attempts to disable already-disabled devices
PCI: Disable Bus Master unconditionally in pci_device_shutdown()
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 393cf095a0c4..924e4665bd57 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1168,7 +1168,7 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags) dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK); } - if (atomic_add_return(1, &dev->enable_cnt) > 1) + if (atomic_inc_return(&dev->enable_cnt) > 1) return 0; /* already enabled */ /* only skip sriov related */ @@ -1395,7 +1395,10 @@ pci_disable_device(struct pci_dev *dev) if (dr) dr->enabled = 0; - if (atomic_sub_return(1, &dev->enable_cnt) != 0) + dev_WARN_ONCE(&dev->dev, atomic_read(&dev->enable_cnt) <= 0, + "disabling already-disabled device"); + + if (atomic_dec_return(&dev->enable_cnt) != 0) return; do_pci_disable_device(dev); |