From ef1b7bb7ad5326755dbbc34023ff70091c999b6d Mon Sep 17 00:00:00 2001
From: Len Brown <lenb@kernel.org>
Date: Sun, 15 Mar 2009 23:36:38 -0400
Subject: [PATCH] --- yaml --- r: 141982 b: refs/heads/master c:
 53af9cfb37af5e03ee2b24c5d5c4963c34e5b765 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/acpi/processor_throttling.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 68516a78339b..6a7733de8c81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a9ef8e1a856be8e526bb9b10fb98c5012f6e3f8
+refs/heads/master: 53af9cfb37af5e03ee2b24c5d5c4963c34e5b765
diff --git a/trunk/drivers/acpi/processor_throttling.c b/trunk/drivers/acpi/processor_throttling.c
index d27838171f4a..5f099012f471 100644
--- a/trunk/drivers/acpi/processor_throttling.c
+++ b/trunk/drivers/acpi/processor_throttling.c
@@ -783,11 +783,9 @@ static int acpi_get_throttling_state(struct acpi_processor *pr,
 		    (struct acpi_processor_tx_tss *)&(pr->throttling.
 						      states_tss[i]);
 		if (tx->control == value)
-			break;
+			return i;
 	}
-	if (i > pr->throttling.state_count)
-		i = -1;
-	return i;
+	return -1;
 }
 
 static int acpi_get_throttling_value(struct acpi_processor *pr,