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 /drivers/acpi/processor_throttling.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| download | linux-dev-d1154be3004e9db2d61533e16bb2cf85dd27a8cb.tar.xz linux-dev-d1154be3004e9db2d61533e16bb2cf85dd27a8cb.zip | |
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>
Diffstat (limited to 'drivers/acpi/processor_throttling.c')
| -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) 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; |