summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-11-30 14:22:54 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-11-30 17:16:31 -0500
commit501634759d55a5b56967de6d9465acf02bbc3565 (patch)
treec0bfc2611d8d8658a115592ba9ba1df26c294b47 /drivers/acpi
parente5517c2a5a49ed5e99047008629f1cd60246ea0e (diff)
ACPI / CPPC: set an error code on probe error path
We should return -EINVAL (instead of 0) if get_cpu_device() fails. Fixes: 158c998ea44b (ACPI / CPPC: add sysfs support to compute delivered performance) Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/cppc_acpi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
index d0d0504b7c89..e0ea8f56d2bf 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -784,8 +784,10 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
784 784
785 /* Add per logical CPU nodes for reading its feedback counters. */ 785 /* Add per logical CPU nodes for reading its feedback counters. */
786 cpu_dev = get_cpu_device(pr->id); 786 cpu_dev = get_cpu_device(pr->id);
787 if (!cpu_dev) 787 if (!cpu_dev) {
788 ret = -EINVAL;
788 goto out_free; 789 goto out_free;
790 }
789 791
790 ret = kobject_init_and_add(&cpc_ptr->kobj, &cppc_ktype, &cpu_dev->kobj, 792 ret = kobject_init_and_add(&cpc_ptr->kobj, &cppc_ktype, &cpu_dev->kobj,
791 "acpi_cppc"); 793 "acpi_cppc");