deadline iosched: make sure queue is valid before unregistering it.

- Fixes oops on boot when freeing initrd in 2.5.58.

deadline iosched: make sure queue is valid before unregistering it.
- Fixes oops on boot when freeing initrd in 2.5.58.
3215ffe1 · Patrick Mochel · bcd8a0e8 · 3215ffe1
Commit 3215ffe1 authored Jan 14, 2003 by Patrick Mochel
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

drivers/block/elevator.c drivers/block/elevator.c +5 -3

No files found.
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
@@ -431,10 +431,12 @@ int elv_register_queue(struct gendisk *disk)
 void elv_unregister_queue(struct gendisk *disk)
 {
 	request_queue_t *q = disk->queue;
-	elevator_t *e = &q->elevator;
-	kobject_unregister(&e->kobj);
+	if (q) {
-	kobject_put(&disk->kobj);
+		elevator_t * e = &q->elevator;
+		kobject_unregister(&e->kobj);
+		kobject_put(&disk->kobj);
+	}
 }
 elevator_t elevator_noop = {