diff options
author | Peter Chubb <peterc@gelato.unsw.edu.au> | 2006-12-04 20:25:31 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-12-06 17:13:38 -0500 |
commit | c7f570a5eca59575572ee231390df727df207bda (patch) | |
tree | 76525f17fafafe9eef8ea542f52fbcba48eb9ded /arch/ia64/pci | |
parent | 3e577a80ea85e2557831fd44064f809646f260b4 (diff) |
[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/ia64/pci')
-rw-r--r-- | arch/ia64/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index f4edfbf27134..eb92cef9cd0d 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) | |||
564 | void | 564 | void |
565 | pcibios_disable_device (struct pci_dev *dev) | 565 | pcibios_disable_device (struct pci_dev *dev) |
566 | { | 566 | { |
567 | if (dev->is_enabled) | 567 | BUG_ON(atomic_read(&dev->enable_cnt)); |
568 | acpi_pci_irq_disable(dev); | 568 | acpi_pci_irq_disable(dev); |
569 | } | 569 | } |
570 | 570 | ||
571 | void | 571 | void |