From 5bbd8039aeea901918c1a472bf94b5d85d957d13 Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Sat, 3 Sep 2005 00:34:32 -0400 Subject: [PATCH] --- yaml --- r: 7844 b: refs/heads/master c: 5f0110f2a716376f3b260703835f527ca8900946 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/pci_irq.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7c2fc7bb9bfa..74557da4fe70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8713cbefafbb5a101ade541a4b0ffa108bf697cc +refs/heads/master: 5f0110f2a716376f3b260703835f527ca8900946 diff --git a/trunk/drivers/acpi/pci_irq.c b/trunk/drivers/acpi/pci_irq.c index 2bbfba8e8c6d..09567c2edcfb 100644 --- a/trunk/drivers/acpi/pci_irq.c +++ b/trunk/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. */