1 files changed, 15 insertions, 9 deletions

diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
index 8adac69dba3d..2e981732805b 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -299,8 +299,10 @@ int acpi_get_psd_map(struct cpudata **all_cpu_data)
                         continue;
 
                 cpc_ptr = per_cpu(cpc_desc_ptr, i);
-                if (!cpc_ptr)
-                        continue;
+                if (!cpc_ptr) {
+                        retval = -EFAULT;
+                        goto err_ret;
+                }
 
                 pdomain = &(cpc_ptr->domain_info);
                 cpumask_set_cpu(i, pr->shared_cpu_map);
@@ -322,8 +324,10 @@ int acpi_get_psd_map(struct cpudata **all_cpu_data)
                                 continue;
 
                         match_cpc_ptr = per_cpu(cpc_desc_ptr, j);
-                        if (!match_cpc_ptr)
-                                continue;
+                        if (!match_cpc_ptr) {
+                                retval = -EFAULT;
+                                goto err_ret;
+                        }
 
                         match_pdomain = &(match_cpc_ptr->domain_info);
                         if (match_pdomain->domain != pdomain->domain)
@@ -353,8 +357,10 @@ int acpi_get_psd_map(struct cpudata **all_cpu_data)
                                 continue;
 
                         match_cpc_ptr = per_cpu(cpc_desc_ptr, j);
-                        if (!match_cpc_ptr)
-                                continue;
+                        if (!match_cpc_ptr) {
+                                retval = -EFAULT;
+                                goto err_ret;
+                        }
 
                         match_pdomain = &(match_cpc_ptr->domain_info);
                         if (match_pdomain->domain != pdomain->domain)
@@ -595,9 +601,6 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
         /* Store CPU Logical ID */
         cpc_ptr->cpu_id = pr->id;
 
-        /* Plug it into this CPUs CPC descriptor. */
-        per_cpu(cpc_desc_ptr, pr->id) = cpc_ptr;
-
         /* Parse PSD data for this CPU */
         ret = acpi_get_psd(cpc_ptr, handle);
         if (ret)
@@ -610,6 +613,9 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
                         goto out_free;
         }
 
+        /* Plug PSD data into this CPUs CPC descriptor. */
+        per_cpu(cpc_desc_ptr, pr->id) = cpc_ptr;
+
         /* Everything looks okay */
         pr_debug("Parsed CPC struct for CPU: %d\n", pr->id);