git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[sfrench/cifs-2.6.git]
/
block
/
elevator.c
diff --git
a/block/elevator.c
b/block/elevator.c
index a0afdd317ceffb3d59f230c775da6c03740a426f..d00b283f31d21fdb5256754b75336e1005fb7eed 100644
(file)
--- 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);
* 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);
q->elevator = old_elevator;
elv_register_queue(q);
clear_bit(QUEUE_FLAG_ELVSWITCH, &q->queue_flags);
- if (e)
- kobject_put(&e->kobj);
return 0;
}
return 0;
}