Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mv-sheeva.git] / kernel / padata.c

diff --git a/kernel/padata.c b/kernel/padata.c
index fd4679266ede7b8d4fd5ca03e9530fdcb3088ab1..751019415d232b04f73273302ed707b39bad66df 100644 (file)
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -864,7 +864,7 @@ static int padata_cpu_callback(struct notifier_block *nfb,
                err = __padata_add_cpu(pinst, cpu);
                mutex_unlock(&pinst->lock);
                if (err)
-                       return NOTIFY_BAD;
+                       return notifier_from_errno(err);
                break;
 
        case CPU_DOWN_PREPARE:
@@ -875,7 +875,7 @@ static int padata_cpu_callback(struct notifier_block *nfb,
                err = __padata_remove_cpu(pinst, cpu);
                mutex_unlock(&pinst->lock);
                if (err)
-                       return NOTIFY_BAD;
+                       return notifier_from_errno(err);
                break;
 
        case CPU_UP_CANCELED: