diff options
| author | Len Brown <len.brown@intel.com> | 2008-01-23 23:48:19 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-01-23 23:48:19 -0500 |
| commit | 7456337d1fd38e463674dcb5a3df21ca332cb8b0 (patch) | |
| tree | e9d3978bff8e02c66182d1a4af893569d61c4c7a /drivers | |
| parent | 667984d9e481e43a930a478c588dced98cb61fea (diff) | |
| parent | d1154be3004e9db2d61533e16bb2cf85dd27a8cb (diff) | |
Pull bugzilla-9747 into release branch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/processor_throttling.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index 6742d7bc4777..1685b40abda7 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) | |||
| 775 | acpi_processor_get_throttling_states(pr) || | 775 | acpi_processor_get_throttling_states(pr) || |
| 776 | acpi_processor_get_platform_limit(pr)) | 776 | acpi_processor_get_platform_limit(pr)) |
| 777 | { | 777 | { |
| 778 | if (acpi_processor_get_fadt_info(pr)) | ||
| 779 | return 0; | ||
| 780 | pr->throttling.acpi_processor_get_throttling = | 778 | pr->throttling.acpi_processor_get_throttling = |
| 781 | &acpi_processor_get_throttling_fadt; | 779 | &acpi_processor_get_throttling_fadt; |
| 782 | pr->throttling.acpi_processor_set_throttling = | 780 | pr->throttling.acpi_processor_set_throttling = |
| 783 | &acpi_processor_set_throttling_fadt; | 781 | &acpi_processor_set_throttling_fadt; |
| 782 | if (acpi_processor_get_fadt_info(pr)) | ||
| 783 | return 0; | ||
| 784 | } else { | 784 | } else { |
| 785 | pr->throttling.acpi_processor_get_throttling = | 785 | pr->throttling.acpi_processor_get_throttling = |
| 786 | &acpi_processor_get_throttling_ptc; | 786 | &acpi_processor_get_throttling_ptc; |