X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=mm%2Fslub.c;h=749588a50a5ac2764eb49cf944d8bf784eedfb5f;hb=ff740fb02146c83d96def1b897ed232b4e0fbcfd;hp=7ad489af95614602a2f5fec8756460108a1f6be1;hpb=88ed86fee6651033de9b7038dac7869a9f19775a;p=linux-2.6-omap-h63xx.git

diff --git a/mm/slub.c b/mm/slub.c
index 7ad489af956..749588a50a5 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2931,8 +2931,10 @@ static int slab_memory_callback(struct notifier_block *self,
 	case MEM_CANCEL_OFFLINE:
 		break;
 	}
-
-	ret = notifier_from_errno(ret);
+	if (ret)
+		ret = notifier_from_errno(ret);
+	else
+		ret = NOTIFY_OK;
 	return ret;
 }