X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=block%2Fnoop-iosched.c;fp=block%2Fnoop-iosched.c;h=f370e4a7fe6d7a26e66f988774c002af6b772725;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=56a7c620574f86c0338a431354344d149314ce0f;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/block/noop-iosched.c b/block/noop-iosched.c
index 56a7c6205..f370e4a7f 100644
--- a/block/noop-iosched.c
+++ b/block/noop-iosched.c
@@ -65,15 +65,16 @@ noop_latter_request(request_queue_t *q, struct request *rq)
 	return list_entry(rq->queuelist.next, struct request, queuelist);
 }
 
-static void *noop_init_queue(request_queue_t *q, elevator_t *e)
+static int noop_init_queue(request_queue_t *q, elevator_t *e)
 {
 	struct noop_data *nd;
 
 	nd = kmalloc(sizeof(*nd), GFP_KERNEL);
 	if (!nd)
-		return NULL;
+		return -ENOMEM;
 	INIT_LIST_HEAD(&nd->queue);
-	return nd;
+	e->elevator_data = nd;
+	return 0;
 }
 
 static void noop_exit_queue(elevator_t *e)