diff --git a/[refs] b/[refs]
index c7c213b94104..e653e86769d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8ea2cb5120a92fe63053a2896be42abbb919a76
+refs/heads/master: cff3ba2204a0797b05150a4b2b7f40a55023d952
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 23cfbe528be1..e58928e809ea 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -155,9 +155,10 @@ static void elevator_setup_default(void)
  	/*
  	 * If the given scheduler is not available, fall back to no-op.
  	 */
- 	if (!(e = elevator_find(chosen_elevator)))
+ 	if ((e = elevator_find(chosen_elevator)))
+		elevator_put(e);
+	else
  		strcpy(chosen_elevator, "noop");
-	elevator_put(e);
 }
 
 static int __init elevator_setup(char *str)