diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-25 17:57:32 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 17:57:32 +0200 |
| commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
| tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /block/elevator.c | |
| parent | [CIFS] Enable sec flags on mount for cifs (part one) (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-bbe5d235ee201705530a7153b57e141cd77d818b.tar.xz linux-bbe5d235ee201705530a7153b57e141cd77d818b.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/block/elevator.c b/block/elevator.c index a0afdd317cef..d00b283f31d2 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -850,12 +850,9 @@ fail_register: * 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; } |