From patchwork Wed Nov 4 03:59:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenji Kaneshige X-Patchwork-Id: 57455 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA440APd016169 for ; Wed, 4 Nov 2009 04:00:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752930AbZKDEAE (ORCPT ); Tue, 3 Nov 2009 23:00:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754530AbZKDEAD (ORCPT ); Tue, 3 Nov 2009 23:00:03 -0500 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:41549 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752930AbZKDEAC (ORCPT ); Tue, 3 Nov 2009 23:00:02 -0500 Received: from m3.gw.fujitsu.co.jp ([10.0.50.73]) by fgwmail6.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id nA4403cW027246 (envelope-from kaneshige.kenji@jp.fujitsu.com); Wed, 4 Nov 2009 13:00:04 +0900 Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 5002D45DE51; Wed, 4 Nov 2009 13:00:03 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 1F5A545DE4E; Wed, 4 Nov 2009 13:00:03 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id E099D1DB8040; Wed, 4 Nov 2009 13:00:02 +0900 (JST) Received: from sw12.gw.fujitsu.co.jp (sw12.gw.fujitsu.co.jp [10.0.76.52]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 55F181DB803C; Wed, 4 Nov 2009 13:00:02 +0900 (JST) Received: from [127.0.0.1] ([172.31.143.6]) by sw12.gw.fujitsu.co.jp with ESMTP id nA4400ak027702; Wed, 4 Nov 2009 13:00:01 +0900 (JST) X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Received: from KANE-LIFEBOOK[172.31.143.6] by KANE-LIFEBOOK (FujitsuOutboundMailChecker v1.3.1/9992[172.31.143.6]); Wed, 04 Nov 2009 13:00:00 +0900 (JST) Message-ID: <4AF0FC3B.7080406@jp.fujitsu.com> Date: Wed, 04 Nov 2009 12:59:55 +0900 From: Kenji Kaneshige User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: linux-pci@vger.kernel.org, jesse.barnes@intel.com Subject: [PATCH] pci hotplug: fix oshp evaluation Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Index: 20091026/drivers/pci/hotplug/acpi_pcihp.c =================================================================== --- 20091026.orig/drivers/pci/hotplug/acpi_pcihp.c +++ 20091026/drivers/pci/hotplug/acpi_pcihp.c @@ -362,6 +362,8 @@ int acpi_get_hp_hw_control_from_firmware 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 }; } @@ -394,10 +396,9 @@ int acpi_get_hp_hw_control_from_firmware if (ACPI_FAILURE(status)) break; } - +no_control: dbg("Cannot get control of hotplug hardware for pci %s\n", pci_name(pdev)); - kfree(string.pointer); return -ENODEV; got_one: