Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / powerpc / platforms / pseries / dlpar.c

diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 57ceb92..e9be25b 100644 (file)
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -262,12 +262,11 @@ int dlpar_attach_node(struct device_node *dn)
        if (!dn->parent)
                return -ENOMEM;
 
-       rc = blocking_notifier_call_chain(&pSeries_reconfig_chain,
-                                         PSERIES_RECONFIG_ADD, dn);
-       if (rc == NOTIFY_BAD) {
+       rc = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, dn);
+       if (rc) {
                printk(KERN_ERR "Failed to add device node %s\n",
                       dn->full_name);
-               return -ENOMEM; /* For now, safe to assume kmalloc failure */
+               return rc;
        }
 
        of_attach_node(dn);
@@ -297,8 +296,7 @@ int dlpar_detach_node(struct device_node *dn)
                remove_proc_entry(dn->pde->name, parent->pde);
 #endif
 
-       blocking_notifier_call_chain(&pSeries_reconfig_chain,
-                           PSERIES_RECONFIG_REMOVE, dn);
+       pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, dn);
        of_detach_node(dn);
        of_node_put(dn); /* Must decrement the refcount */