1 files changed, 8 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 7213d930918d..742694c1d852 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -69,7 +69,7 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,
          */
         token = of_get_flat_dt_prop(node, "ibm,configure-kernel-dump", NULL);
         if (!token)
-                return 0;
+                return 1;
 
         fw_dump.fadump_supported = 1;
         fw_dump.ibm_configure_kernel_dump = *token;
@@ -92,7 +92,7 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,
                                         &size);
 
         if (!sections)
-                return 0;
+                return 1;
 
         num_sections = size / (3 * sizeof(u32));
 
@@ -110,6 +110,7 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,
                         break;
                 }
         }
+
         return 1;
 }
 
@@ -645,7 +646,7 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
                 }
                 /* Lower 4 bytes of reg_value contains logical cpu id */
                 cpu = reg_entry->reg_value & FADUMP_CPU_ID_MASK;
-                if (!cpumask_test_cpu(cpu, &fdh->cpu_online_mask)) {
+                if (fdh && !cpumask_test_cpu(cpu, &fdh->cpu_online_mask)) {
                         SKIP_TO_NEXT_CPU(reg_entry);
                         continue;
                 }
@@ -662,9 +663,11 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
         }
         fadump_final_note(note_buf);
 
-        pr_debug("Updating elfcore header (%llx) with cpu notes\n",
+        if (fdh) {
+                pr_debug("Updating elfcore header (%llx) with cpu notes\n",
                                                         fdh->elfcorehdr_addr);
-        fadump_update_elfcore_header((char *)__va(fdh->elfcorehdr_addr));
+                fadump_update_elfcore_header((char *)__va(fdh->elfcorehdr_addr));
+        }
         return 0;
 
 error_out: