summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/processor_throttling.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-05 01:52:07 -0400
committerLen Brown <len.brown@intel.com>2009-04-05 01:52:07 -0400
commit8a3f257c704e02aee9869decd069a806b45be3f1 (patch)
treeadb9d3766c57119381304c3b94334997cc7a74a7 /drivers/acpi/processor_throttling.c
parent33526a53600ac887d100e3c9b4be3637ac8ae3a5 (diff)
parent15065531c1c5902775ae3ade24eb37d0e688353b (diff)
downloadlinux-8a3f257c704e02aee9869decd069a806b45be3f1.tar.bz2
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/processor_throttling.c')
-rw-r--r--drivers/acpi/processor_throttling.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 73aed5f5b973..d0d1f4d50434 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/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,