diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:52:07 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:52:07 -0400 |
| commit | 8a3f257c704e02aee9869decd069a806b45be3f1 (patch) | |
| tree | adb9d3766c57119381304c3b94334997cc7a74a7 /drivers/acpi/processor_throttling.c | |
| parent | 33526a53600ac887d100e3c9b4be3637ac8ae3a5 (diff) | |
| parent | 15065531c1c5902775ae3ade24eb37d0e688353b (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/processor_throttling.c')
| -rw-r--r-- | drivers/acpi/processor_throttling.c | 6 |
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, | |||
| 783 | (struct acpi_processor_tx_tss *)&(pr->throttling. | 783 | (struct acpi_processor_tx_tss *)&(pr->throttling. |
| 784 | states_tss[i]); | 784 | states_tss[i]); |
| 785 | if (tx->control == value) | 785 | if (tx->control == value) |
| 786 | break; | 786 | return i; |
| 787 | } | 787 | } |
| 788 | if (i > pr->throttling.state_count) | 788 | return -1; |
| 789 | i = -1; | ||
| 790 | return i; | ||
| 791 | } | 789 | } |
| 792 | 790 | ||
| 793 | static int acpi_get_throttling_value(struct acpi_processor *pr, | 791 | static int acpi_get_throttling_value(struct acpi_processor *pr, |