Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[mv-sheeva.git] / drivers / base / topology.c

diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index bf6b13206d00cbb4dda735829b6df2f740b80fa9..9fc630ce1ddb4b46f93dd2c35a459849399efa8b 100644 (file)
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -162,7 +162,7 @@ static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
                topology_remove_dev(cpu);
                break;
        }
-       return rc ? NOTIFY_BAD : NOTIFY_OK;
+       return notifier_from_errno(rc);
 }
 
 static int __cpuinit topology_sysfs_init(void)