Commit c7f570a5 authored by Peter Chubb's avatar Peter Chubb Committed by Tony Luck

[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: default avatarPeter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 3e577a80
...@@ -564,8 +564,8 @@ pcibios_enable_device (struct pci_dev *dev, int mask) ...@@ -564,8 +564,8 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
void void
pcibios_disable_device (struct pci_dev *dev) pcibios_disable_device (struct pci_dev *dev)
{ {
if (dev->is_enabled) BUG_ON(atomic_read(&dev->enable_cnt));
acpi_pci_irq_disable(dev); acpi_pci_irq_disable(dev);
} }
void void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment