PCI: pcie AER: don't check _OSC when acpi is disabled
authorYinghai Lu <Yinghai.Lu@Sun.COM>
Sun, 3 Feb 2008 06:24:47 +0000 (22:24 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 21 Apr 2008 04:47:02 +0000 (21:47 -0700)
[PATCH] pcie AER: don't check _OSC when acpi is disabled

when acpi=off or pci=noacpi, get warning

AER service couldn't init device 0000:00:0a.0:pcie01 - no _OSC support
AER service couldn't init device 0000:00:0e.0:pcie01 - no _OSC support
AER service couldn't init device 0000:00:0f.0:pcie01 - no _OSC support
AER service couldn't init device 0000:80:0b.0:pcie01 - no _OSC support
AER service couldn't init device 0000:80:0e.0:pcie01 - no _OSC support
AER service couldn't init device 0000:80:0f.0:pcie01 - no _OSC support

so don't check _OSC in aer_osc_setup

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/pci/pcie/aer/aerdrv_acpi.c

index 8c199ae84f6dbadc59d46d876448b3f522bd849b..7e53fa590cf2dbd42f2c7cda48feba3e66d867a4 100644 (file)
@@ -33,6 +33,9 @@ int aer_osc_setup(struct pcie_device *pciedev)
        struct pci_dev *pdev = pciedev->port;
        acpi_handle handle = 0;
 
+       if (acpi_pci_disabled)
+               return -1;
+
        /* Find root host bridge */
        while (pdev->bus && pdev->bus->self)
                pdev = pdev->bus->self;