Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/k…

…ernel/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.
git-mirror · Dec 7, 2006 · 9232d58 · 9232d58
2 parents 2fdb611 + c7f570a
commit 9232d58
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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