1 files changed, 7 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/wsp/wsp.c b/arch/powerpc/platforms/wsp/wsp.c
index d25cc96c21b8..ddb6efe88914 100644
--- a/arch/powerpc/platforms/wsp/wsp.c
+++ b/arch/powerpc/platforms/wsp/wsp.c
@@ -89,6 +89,7 @@ void wsp_halt(void)
         struct device_node *dn;
         struct device_node *mine;
         struct device_node *me;
+        int rc;
 
         me = of_get_cpu_node(smp_processor_id(), NULL);
         mine = scom_find_parent(me);
@@ -101,15 +102,15 @@ void wsp_halt(void)
 
                 /* read-modify-write it so the HW probe does not get
                  * confused */
-                val = scom_read(m, 0);
-                val |= 1;
-                scom_write(m, 0, val);
+                rc = scom_read(m, 0, &val);
+                if (rc == 0)
+                        scom_write(m, 0, val | 1);
                 scom_unmap(m);
         }
         m = scom_map(mine, 0, 1);
-        val = scom_read(m, 0);
-        val |= 1;
-        scom_write(m, 0, val);
+        rc = scom_read(m, 0, &val);
+        if (rc == 0)
+                scom_write(m, 0, val | 1);
         /* should never return */
         scom_unmap(m);
 }