From patchwork Fri Jul 30 22:37:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 116131 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 o6UMeVQ1011083 for ; Fri, 30 Jul 2010 22:40:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755823Ab0G3Wke (ORCPT ); Fri, 30 Jul 2010 18:40:34 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:49409 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755600Ab0G3Wka (ORCPT ); Fri, 30 Jul 2010 18:40:30 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 258A818CECA; Sat, 31 Jul 2010 00:35:09 +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 30369-05; Sat, 31 Jul 2010 00:34:55 +0200 (CEST) Received: from ferrari.localnet (unknown [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 4FD1E18DB05; Sat, 31 Jul 2010 00:34:38 +0200 (CEST) From: "Rafael J. Wysocki" To: Jesse Barnes Subject: [PATCH 7/7] ACPI / PCI: Reorder checks in acpi_pci_osc_control_set() Date: Sat, 31 Jul 2010 00:37:36 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.35-rc6-rjw+; KDE/4.4.4; x86_64; ; ) Cc: Kenji Kaneshige , Hidetoshi Seto , Matthew Garrett , linux-pci@vger.kernel.org, linux-pm@lists.linux-foundation.org, ACPI Devel Maling List , Len Brown References: <201007310020.56546.rjw@sisk.pl> In-Reply-To: <201007310020.56546.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201007310037.36543.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, 30 Jul 2010 22:40:36 +0000 (UTC) Index: linux-2.6/drivers/acpi/pci_root.c =================================================================== --- linux-2.6.orig/drivers/acpi/pci_root.c +++ linux-2.6/drivers/acpi/pci_root.c @@ -414,10 +414,6 @@ acpi_status acpi_pci_osc_control_set(acp acpi_handle tmp; struct acpi_pci_root *root; - status = acpi_get_handle(handle, "_OSC", &tmp); - if (ACPI_FAILURE(status)) - return status; - control_req = (flags & OSC_PCI_CONTROL_MASKS); if (!control_req) return AE_TYPE; @@ -426,6 +422,10 @@ acpi_status acpi_pci_osc_control_set(acp if (!root) return AE_NOT_EXIST; + status = acpi_get_handle(handle, "_OSC", &tmp); + if (ACPI_FAILURE(status)) + return status; + mutex_lock(&osc_lock); /* No need to evaluate _OSC if the control was already granted. */ if ((root->osc_control_set & control_req) == control_req)