Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757940AbXLLELA (ORCPT ); Tue, 11 Dec 2007 23:11:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752635AbXLLEKk (ORCPT ); Tue, 11 Dec 2007 23:10:40 -0500 Received: from sca-es-mail-2.Sun.COM ([192.18.43.133]:48371 "EHLO sca-es-mail-2.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751848AbXLLEKi (ORCPT ); Tue, 11 Dec 2007 23:10:38 -0500 Date: Tue, 11 Dec 2007 20:13:48 -0800 From: Yinghai Lu Subject: [PATCH] pcie AER: don't check _OSC when acpi is disabled To: Andrew Morton Cc: LKML Message-id: <200712112013.48346.yinghai.lu@sun.com> Organization: Sun MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT Content-disposition: inline User-Agent: KMail/1.9.6 (enterprise 20070904.708012) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 868 Lines: 25 [PATCH] pcie AER: don't check _OSC when acpi is disabled when acpi=off and pci=nomsi, don't check _OSC in aer_osc_setup Signed-off-by: Yinghai Lu diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c index 1a1eb45..dd38777 100644 --- a/drivers/pci/pcie/aer/aerdrv_acpi.c +++ b/drivers/pci/pcie/aer/aerdrv_acpi.c @@ -34,6 +34,9 @@ int aer_osc_setup(struct pcie_device *pciedev) acpi_handle handle = DEVICE_ACPI_HANDLE(&pdev->dev); struct pci_bus *parent; + if (acpi_pci_disabled) + return -1; + while (!handle) { if (!pdev || !pdev->bus->parent) break; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/