From f8620c60192fe8d81dcc5ddcd8cde40f9e62822a Mon Sep 17 00:00:00 2001
From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 11 May 2009 09:36:01 +0800
Subject: [PATCH] --- yaml --- r: 145057 b: refs/heads/master c:
 4973b22aa8c70fe036e3e0039f104cf5bb7fe2b1 h: refs/heads/master i:   145055:
 53cbba88408ea13733b12e94bfddd16dc30b14dc v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/acpi/processor_throttling.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a32fce2ceb98..21ed64c806d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56c213fa012f2bad9eff908292ff2500f840b020
+refs/heads/master: 4973b22aa8c70fe036e3e0039f104cf5bb7fe2b1
diff --git a/trunk/drivers/acpi/processor_throttling.c b/trunk/drivers/acpi/processor_throttling.c
index 5f09fb8c0e05..7f16f5f8e7d3 100644
--- a/trunk/drivers/acpi/processor_throttling.c
+++ b/trunk/drivers/acpi/processor_throttling.c
@@ -838,6 +838,14 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
 	ret = acpi_read_throttling_status(pr, &value);
 	if (ret >= 0) {
 		state = acpi_get_throttling_state(pr, value);
+		if (state == -1) {
+			ACPI_WARNING((AE_INFO,
+				"Invalid throttling state, reset\n"));
+			state = 0;
+			ret = acpi_processor_set_throttling(pr, state);
+			if (ret)
+				return ret;
+		}
 		pr->throttling.state = state;
 	}