From 80135d29921b27b93ece05759f954c24f419543d Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Mon, 11 Feb 2013 16:47:01 -0700 Subject: [PATCH] --- yaml --- r: 358436 b: refs/heads/master c: cc7ba39bab126339d6d525ada07dea5633d71521 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3ca49d7c5376..88870545eb96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd6dceab017e6be6c158dc56ec6dacf817f21a5b +refs/heads/master: cc7ba39bab126339d6d525ada07dea5633d71521 diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index 29a09b705f04..c746b04afd6a 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -1174,7 +1174,7 @@ static int __pci_enable_device_flags(struct pci_dev *dev, 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 */ @@ -1404,7 +1404,7 @@ pci_disable_device(struct pci_dev *dev) dev_WARN_ONCE(&dev->dev, atomic_read(&dev->enable_cnt) <= 0, "disabling already-disabled device"); - if (atomic_sub_return(1, &dev->enable_cnt) != 0) + if (atomic_dec_return(&dev->enable_cnt) != 0) return; do_pci_disable_device(dev);