aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPeter Chubb <peterc@gelato.unsw.edu.au>2006-12-05 12:25:31 +1100
committerTony Luck <tony.luck@intel.com>2006-12-06 14:13:38 -0800
commitc7f570a5eca59575572ee231390df727df207bda (patch)
tree76525f17fafafe9eef8ea542f52fbcba48eb9ded /arch
parent3e577a80ea85e2557831fd44064f809646f260b4 (diff)
downloadlinux-linaro-c7f570a5eca59575572ee231390df727df207bda.tar.gz
[IA64] Fix pci.c kernel compilation breakage.
The recent change to convert the is_enabled flag in the PCI device to an atomic count broke the IA64 compilation. As pcibios_disable_device is only ever called if the reference count is zero, convert the if to a BUG_ON. Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/pci/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index f4edfbf2713..eb92cef9cd0 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -564,8 +564,8 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
void
pcibios_disable_device (struct pci_dev *dev)
{
- if (dev->is_enabled)
- acpi_pci_irq_disable(dev);
+ BUG_ON(atomic_read(&dev->enable_cnt));
+ acpi_pci_irq_disable(dev);
}
void