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.

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.
9232d587 · Linus Torvalds · 2fdb611d · c7f570a5 · 9232d587
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

arch/ia64/pci/pci.c arch/ia64/pci/pci.c +2 -2

未找到文件。
--- 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)
+	BUG_ON(atomic_read(&dev->enable_cnt));
-		acpi_pci_irq_disable(dev);
+	acpi_pci_irq_disable(dev);
 }
 void