summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Miller <mike.miller@hp.com>2005-12-12 22:17:14 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 22:31:16 -0800
commit2f6331faf58a4727a9f1138cd6db30d05b124220 (patch)
treea285f5260b8256f018b05db7c8a6b5470baf85ff
parent8309cf66fd90ccba9894adde2f3a8d7e1507e4d2 (diff)
[PATCH] cciss: fix for deregister_disk
This patch adds setting our drv->queue = NULL back in deregister_disk. The drv->queue is part of our controller struct. blk_cleanup_queue works only on the queue in the gendisk struct. Signed-off-by: Mike Miller <mike.miller@hp.com> Cc: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/block/cciss.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index e34104d32637..c3441b3f086e 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1464,8 +1464,10 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
request_queue_t *q = disk->queue;
if (disk->flags & GENHD_FL_UP)
del_gendisk(disk);
- if (q)
+ if (q) {
blk_cleanup_queue(q);
+ drv->queue = NULL;
+ }
}
}