diff --git a/[refs] b/[refs]
index 98ea1400b5c3..263e814e373f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8309cf66fd90ccba9894adde2f3a8d7e1507e4d2
+refs/heads/master: 2f6331faf58a4727a9f1138cd6db30d05b124220
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index e34104d32637..c3441b3f086e 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/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;
+			}
 		}
 	}