diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-10-08 02:40:42 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-10-09 04:51:27 +0200 |
| commit | e8b1b59dc8e42a47c4ce541bd1767ffac206b29c (patch) | |
| tree | c64aaad7cb6a187a2acc9ec17c9984c05c120b5d /drivers/acpi/processor_idle.c | |
| parent | Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/... (diff) | |
| download | linux-e8b1b59dc8e42a47c4ce541bd1767ffac206b29c.tar.xz linux-e8b1b59dc8e42a47c4ce541bd1767ffac206b29c.zip | |
cpuidle / ACPI: fix potential NULL pointer dereference
The dereference should be moved below the NULL test.
dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 3655ab923812..e8086c725305 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -1132,7 +1132,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) int acpi_processor_hotplug(struct acpi_processor *pr) { int ret = 0; - struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id); + struct cpuidle_device *dev; if (disabled_by_idle_boot_param()) return 0; @@ -1147,6 +1147,7 @@ int acpi_processor_hotplug(struct acpi_processor *pr) if (!pr->flags.power_setup_done) return -ENODEV; + dev = per_cpu(acpi_cpuidle_device, pr->id); cpuidle_pause_and_lock(); cpuidle_disable_device(dev); acpi_processor_get_power_info(pr); |