From e773020f03abbc8ffecc1efb2543786f940bcde3 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Mon, 12 Jun 2006 14:20:58 +0200
Subject: [PATCH] --- yaml --- r: 29191 b: refs/heads/master c:
 acf421755593f7d7bd9352d57eda796c6eb4fa43 h: refs/heads/master i:   29189:
 761cd456290d786e8dd7d6225f41bfe3e527bd97   29187:
 54e206782ac0d0a3843b2548bd6f955b6d9bd98e   29183:
 abd228295c198bf53d6215ade6d8ea92636507c5 v: v3

---
 [refs]                 | 2 +-
 trunk/block/elevator.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2d693ba47369..0d8496c24b64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fda151d9feafc0e8418f23c716587c44394fcdbf
+refs/heads/master: acf421755593f7d7bd9352d57eda796c6eb4fa43
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index a0afdd317cef..d00b283f31d2 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -850,12 +850,9 @@ static int elevator_switch(request_queue_t *q, struct elevator_type *new_e)
 	 * one again (along with re-adding the sysfs dir)
 	 */
 	elevator_exit(e);
-	e = NULL;
 	q->elevator = old_elevator;
 	elv_register_queue(q);
 	clear_bit(QUEUE_FLAG_ELVSWITCH, &q->queue_flags);
-	if (e)
-		kobject_put(&e->kobj);
 	return 0;
 }