lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: processor: clean up in acpi_processor_start() error exits

Browse Source 
We used to leave crud around if things failed in acpi_processor_start().
This patch cleans up as much as we can before returning.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Reviewed-by: Alex Chiang <achiang@hp.com>
CC: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
CC: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas
2009-06-22 20:41:09 +00:00
committed by Len Brown
parent c1815e0740
commit d4e0526184
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/acpi/processor_core.c
View File

@@ -731,11 +731,13 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
result = acpi_processor_add_fs(device); result = acpi_processor_add_fs(device);
if (result) if (result)
goto end; return result;
sysdev = get_cpu_sysdev(pr->id); sysdev = get_cpu_sysdev(pr->id);
if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev")) if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev")) {
return -EFAULT; result = -EFAULT;
goto err_remove_fs;
}
/* _PDC call should be done before doing anything else (if reqd.). */ /* _PDC call should be done before doing anything else (if reqd.). */
arch_acpi_processor_init_pdc(pr); arch_acpi_processor_init_pdc(pr);
@@ -755,7 +757,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
&processor_cooling_ops); &processor_cooling_ops);
if (IS_ERR(pr->cdev)) { if (IS_ERR(pr->cdev)) {
result = PTR_ERR(pr->cdev); result = PTR_ERR(pr->cdev);
goto end; goto err_power_exit;
} }
dev_info(&device->dev, "registered as cooling_device%d\n", dev_info(&device->dev, "registered as cooling_device%d\n",
@@ -764,13 +766,17 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
result = sysfs_create_link(&device->dev.kobj, result = sysfs_create_link(&device->dev.kobj,
&pr->cdev->device.kobj, &pr->cdev->device.kobj,
"thermal_cooling"); "thermal_cooling");
if (result) if (result) {
printk(KERN_ERR PREFIX "Create sysfs link\n"); printk(KERN_ERR PREFIX "Create sysfs link\n");
goto err_thermal_unregister;
}
result = sysfs_create_link(&pr->cdev->device.kobj, result = sysfs_create_link(&pr->cdev->device.kobj,
&device->dev.kobj, &device->dev.kobj,
"device"); "device");
if (result) if (result) {
printk(KERN_ERR PREFIX "Create sysfs link\n"); printk(KERN_ERR PREFIX "Create sysfs link\n");
goto err_remove_sysfs;
}
if (pr->flags.throttling) { if (pr->flags.throttling) {
printk(KERN_INFO PREFIX "%s [%s] (supports", printk(KERN_INFO PREFIX "%s [%s] (supports",
@@ -779,7 +785,16 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
printk(")\n"); printk(")\n");
} }
end: return 0;
err_remove_sysfs:
sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
err_thermal_unregister:
thermal_cooling_device_unregister(pr->cdev);
err_power_exit:
acpi_processor_power_exit(pr, device);
err_remove_fs:
acpi_processor_remove_fs(device);
return result; return result;
} }