X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Facpi%2Fpci_irq.c;h=09567c2edcfb5225a67deb44d71cba7249915735;hb=9189674026e86e624b1ef1b4eb430e9ad19f9641;hp=2bbfba8e8c6d01bf1cffd23a80afdf98caef7341;hpb=c202ac9fbdb64145f034be266d6ee88c98b40aa8;p=powerpc.git

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 2bbfba8e8c..09567c2edc 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -500,7 +500,7 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
 
 	ACPI_FUNCTION_TRACE("acpi_pci_irq_disable");
 
-	if (!dev)
+	if (!dev || !dev->bus)
 		return_VOID;
 
 	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
@@ -508,9 +508,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
 		return_VOID;
 	pin--;
 
-	if (!dev->bus)
-		return_VOID;
-
 	/*
 	 * First we check the PCI IRQ routing table (PRT) for an IRQ.
 	 */