X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=block%2Felevator.c;h=8985038f398ce503261dc4a29390a63c9f7b5b44;hb=c7309e88a694acbe9e42655f02b9dd37c7931424;hp=59794d0d38e34604a24b6e7a63bf309570b2f8fb;hpb=66893885bbf95b6c9030d97804cb678a70804edf;p=linux-2.6-microblaze.git

diff --git a/block/elevator.c b/block/elevator.c
index 59794d0d38e3..8985038f398c 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -157,7 +157,7 @@ struct elevator_queue *elevator_alloc(struct request_queue *q,
 
 	eq = kzalloc_node(sizeof(*eq), GFP_KERNEL, q->node);
 	if (unlikely(!eq))
-		goto err;
+		return NULL;
 
 	eq->type = e;
 	kobject_init(&eq->kobj, &elv_ktype);
@@ -165,10 +165,6 @@ struct elevator_queue *elevator_alloc(struct request_queue *q,
 	hash_init(eq->hash);
 
 	return eq;
-err:
-	kfree(eq);
-	elevator_put(e);
-	return NULL;
 }
 EXPORT_SYMBOL(elevator_alloc);