powerpc/pseries: Failed reconfig notifier chain call cleanup

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / platforms / pseries / reconfig.c

diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index c591a25b0b0d816d7e3f3c206c205ece673ea871..b6f1b137d427e68de2ea6c4e95dfa63a30e80760 100644 (file)
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -468,9 +468,13 @@ static int do_update_property(char *buf, size_t bufsize)
 
                rc = blocking_notifier_call_chain(&pSeries_reconfig_chain,
                                                  action, value);
+               if (rc == NOTIFY_BAD) {
+                       rc = prom_update_property(np, oldprop, newprop);
+                       return -ENOMEM;
+               }
        }
 
-       return rc;
+       return 0;
 }
 
 /**