From 58d4a77592f90dd69ebc05314c990f05fc8ddcf1 Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Mon, 12 May 2008 22:55:45 +0900
Subject: [PATCH] --- yaml --- r: 96510 b: refs/heads/master c:
 34a65055e5e7304b3d6ad0f7542bf66308eae50a h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/pci/pci-acpi.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e26298158d54..6cfb098c7285 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5d1c8798309a384c2776e5ff472f8ceb6d9065d
+refs/heads/master: 34a65055e5e7304b3d6ad0f7542bf66308eae50a
diff --git a/trunk/drivers/pci/pci-acpi.c b/trunk/drivers/pci/pci-acpi.c
index 468d13e1458e..38fc8b1ff881 100644
--- a/trunk/drivers/pci/pci-acpi.c
+++ b/trunk/drivers/pci/pci-acpi.c
@@ -232,8 +232,14 @@ acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
 {
 	acpi_status	status;
 	u32		ctrlset;
-	struct acpi_osc_data *osc_data = acpi_get_osc_data(handle);
+	acpi_handle tmp;
+	struct acpi_osc_data *osc_data;
+
+	status = acpi_get_handle(handle, "_OSC", &tmp);
+	if (ACPI_FAILURE(status))
+		return status;
 
+	osc_data = acpi_get_osc_data(handle);
 	if (!osc_data) {
 		printk(KERN_ERR "acpi osc data array is full\n");
 		return AE_ERROR;