---

yaml --- r: 138560 b: refs/heads/master c: c5785f9 h: refs/heads/master v: v3
git-mirror · Mar 24, 2009 · a937073 · a937073
1 parent 18a2f3c
commit a937073
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 151a9f4aef53fb9cc1e192c7d321c1d820232f4a
+refs/heads/master: c5785f9e1c1c07c791fdc471f5c7fda4a5855b0c
diff --git a/trunk/arch/powerpc/platforms/pseries/reconfig.c b/trunk/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;
 }
 
 /**