diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 01:16:35 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 01:16:35 +0100 |
| commit | 9232d5876e83921414de65d82edd1098258f6680 (patch) | |
| tree | e174b2a4fe535f5e5386ad0c8e435c24c6c99c04 | |
| parent | [PATCH] ... and then some more work_struct-induced breakage (ibmvscsi) (diff) | |
| parent | [IA64] Fix pci.c kernel compilation breakage. (diff) | |
| download | linux-9232d5876e83921414de65d82edd1098258f6680.tar.xz linux-9232d5876e83921414de65d82edd1098258f6680.zip | |
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 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) 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 |