From patchwork Fri Aug 6 01:11:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 117617 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o761HrWK022468 for ; Fri, 6 Aug 2010 01:17:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934268Ab0HFBRr (ORCPT ); Thu, 5 Aug 2010 21:17:47 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:43668 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934289Ab0HFBRp (ORCPT ); Thu, 5 Aug 2010 21:17:45 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 623EC18FC2B; Fri, 6 Aug 2010 03:10:31 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 02366-02; Fri, 6 Aug 2010 03:10:07 +0200 (CEST) Received: from ferrari.localnet (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 5871818FE7B; Fri, 6 Aug 2010 03:09:50 +0200 (CEST) From: "Rafael J. Wysocki" To: Hidetoshi Seto Subject: [PATCH 7/10] PCI / Hot-plug: Query _OSC before requesting controls Date: Fri, 6 Aug 2010 03:11:33 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.35-rjw+; KDE/4.4.4; x86_64; ; ) Cc: Kenji Kaneshige , Jesse Barnes , linux-pci@vger.kernel.org, ACPI Devel Maling List , linux-pm@lists.linux-foundation.org References: <201008060303.51224.rjw@sisk.pl> In-Reply-To: <201008060303.51224.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201008060311.33359.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 06 Aug 2010 01:17:57 +0000 (UTC) Index: linux-2.6/drivers/pci/hotplug/acpi_pcihp.c =================================================================== --- linux-2.6.orig/drivers/pci/hotplug/acpi_pcihp.c +++ linux-2.6/drivers/pci/hotplug/acpi_pcihp.c @@ -358,11 +358,13 @@ int acpi_get_hp_hw_control_from_firmware acpi_get_name(handle, ACPI_FULL_PATHNAME, &string); dbg("Trying to get hotplug control for %s\n", (char *)string.pointer); + status = acpi_pci_osc_control_query(handle, &flags); + if (ACPI_FAILURE(status) + || !(flags & OSC_SHPC_NATIVE_HP_CONTROL)) + goto no_control; status = acpi_pci_osc_control_set(handle, flags); if (ACPI_SUCCESS(status)) goto got_one; - if (status == AE_SUPPORT) - goto no_control; kfree(string.pointer); string = (struct acpi_buffer){ ACPI_ALLOCATE_BUFFER, NULL }; }