From f286138031b70d7acd7d4a3b75f95aac8f33e3b9 Mon Sep 17 00:00:00 2001
From: Sven Wegener <sven.wegener@stealer.net>
Date: Thu, 16 Oct 2008 14:16:53 +1100
Subject: [PATCH] --- yaml --- r: 115092 b: refs/heads/master c:
 08ff39f1c8f2134f7d0f38123ca5952371665cc5 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/faulty.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 90729cf4e867..1240a9628963 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 255707274ea25d486b7de060a30ba4ac50593408
+refs/heads/master: 08ff39f1c8f2134f7d0f38123ca5952371665cc5
diff --git a/trunk/drivers/md/faulty.c b/trunk/drivers/md/faulty.c
index 268547dbfbd3..f26c1f9a475b 100644
--- a/trunk/drivers/md/faulty.c
+++ b/trunk/drivers/md/faulty.c
@@ -287,6 +287,8 @@ static int run(mddev_t *mddev)
 	int i;
 
 	conf_t *conf = kmalloc(sizeof(*conf), GFP_KERNEL);
+	if (!conf)
+		return -ENOMEM;
 
 	for (i=0; i<Modes; i++) {
 		atomic_set(&conf->counters[i], 0);