diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 16:16:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 16:16:35 -0800 |
| commit | 9232d5876e83921414de65d82edd1098258f6680 (patch) | |
| tree | e174b2a4fe535f5e5386ad0c8e435c24c6c99c04 | |
| parent | 2fdb611d3102509e31ef21c79fc91f97f300b9c3 (diff) | |
| parent | c7f570a5eca59575572ee231390df727df207bda (diff) | |
| download | op-kernel-dev-9232d5876e83921414de65d82edd1098258f6680.zip op-kernel-dev-9232d5876e83921414de65d82edd1098258f6680.tar.gz | |
Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix pci.c kernel compilation breakage.
| -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 f4edfbf..eb92cef 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 |
