luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpuidle / ACPI: fix potential NULL pointer dereference

Browse Source 
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>
This commit is contained in:
Wei Yongjun 2012-10-08 08:40:42 +08:00 committed by Len Brown
parent f5a246eab9
commit e8b1b59dc8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/acpi/processor_idle.c
View File

@ -1132,7 +1132,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
int acpi_processor_hotplug(struct acpi_processor *pr) int acpi_processor_hotplug(struct acpi_processor *pr)
{ {
int ret = 0; int ret = 0;
struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id); struct cpuidle_device *dev;
if (disabled_by_idle_boot_param()) if (disabled_by_idle_boot_param())
return 0; return 0;
@ -1147,6 +1147,7 @@ int acpi_processor_hotplug(struct acpi_processor *pr)
if (!pr->flags.power_setup_done) if (!pr->flags.power_setup_done)
return -ENODEV; return -ENODEV;
dev = per_cpu(acpi_cpuidle_device, pr->id);
cpuidle_pause_and_lock(); cpuidle_pause_and_lock();
cpuidle_disable_device(dev); cpuidle_disable_device(dev);
acpi_processor_get_power_info(pr); acpi_processor_get_power_info(pr);