diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-01-15 00:47:47 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-01-15 00:47:47 -0500 |
commit | d1154be3004e9db2d61533e16bb2cf85dd27a8cb (patch) | |
tree | 2fb9d0dc13cc07557b082e58aa7e8d4a46fe5904 | |
parent | 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 (diff) |
ACPI: processor: Fix null pointer dereference in throttling
http://bugzilla.kernel.org/show_bug.cgi?id=9747
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
-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; |