From: Andrew Morton <akpm@osdl.org>

How hard is grep?

Cc: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/ia64/pci/pci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/ia64/pci/pci.c~fix-gregkh-pci-pci-enable-disable-device-is-nestable arch/ia64/pci/pci.c
--- a/arch/ia64/pci/pci.c~fix-gregkh-pci-pci-enable-disable-device-is-nestable
+++ a/arch/ia64/pci/pci.c
@@ -564,7 +564,7 @@ pcibios_enable_device (struct pci_dev *d
 void
 pcibios_disable_device (struct pci_dev *dev)
 {
-	if (dev->is_enabled)
+	if (atomic_read(&dev->enable_cnt))
 		acpi_pci_irq_disable(dev);
 }
 
_