Merge branch 'misc' into release

This commit is contained in:
Len Brown
2009-04-05 01:52:07 -04:00
9 changed files with 43 additions and 26 deletions

View File

@@ -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,