diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 268547dbfbd30ce2942b3b5d92c9bbfab793d4b7..f26c1f9a475b8d9cbad5f885016e50723b580cd5 100644
--- a/drivers/md/faulty.c
+++ b/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);