diff --git a/[refs] b/[refs] index 5d188bdde2d1..c7c213b94104 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd52d1ee9a92587b242d946a2300a3245d3b885a +refs/heads/master: b8ea2cb5120a92fe63053a2896be42abbb919a76 diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c index d4a49a3df829..23cfbe528be1 100644 --- a/trunk/block/elevator.c +++ b/trunk/block/elevator.c @@ -190,14 +190,14 @@ int elevator_init(request_queue_t *q, char *name) eq = kmalloc(sizeof(struct elevator_queue), GFP_KERNEL); if (!eq) { - elevator_put(e->elevator_type); + elevator_put(e); return -ENOMEM; } ret = elevator_attach(q, e, eq); if (ret) { kfree(eq); - elevator_put(e->elevator_type); + elevator_put(e); } return ret;