summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-01-23 23:48:19 -0500
committerLen Brown <len.brown@intel.com>2008-01-23 23:48:19 -0500
commit7456337d1fd38e463674dcb5a3df21ca332cb8b0 (patch)
treee9d3978bff8e02c66182d1a4af893569d61c4c7a
parent667984d9e481e43a930a478c588dced98cb61fea (diff)
parentd1154be3004e9db2d61533e16bb2cf85dd27a8cb (diff)
downloadop-kernel-dev-7456337d1fd38e463674dcb5a3df21ca332cb8b0.zip
op-kernel-dev-7456337d1fd38e463674dcb5a3df21ca332cb8b0.tar.gz
Pull bugzilla-9747 into release branch
-rw-r--r--drivers/acpi/processor_throttling.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 6742d7b..1685b40a 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -775,12 +775,12 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
acpi_processor_get_throttling_states(pr) ||
acpi_processor_get_platform_limit(pr))
{
- if (acpi_processor_get_fadt_info(pr))
- return 0;
pr->throttling.acpi_processor_get_throttling =
&acpi_processor_get_throttling_fadt;
pr->throttling.acpi_processor_set_throttling =
&acpi_processor_set_throttling_fadt;
+ if (acpi_processor_get_fadt_info(pr))
+ return 0;
} else {
pr->throttling.acpi_processor_get_throttling =
&acpi_processor_get_throttling_ptc;
OpenPOWER on IntegriCloud