1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index a9e33db46e68..c3441b3f086e 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1146,7 +1146,6 @@ static int revalidate_allvol(ctlr_info_t *host)
                                 del_gendisk(disk);
                         if (q)
                                 blk_cleanup_queue(q);
-                        put_disk(disk);
                 }
         }
 
@@ -1465,9 +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);
-                        put_disk(disk); 
+                                drv->queue = NULL;
+                        }
                 }
         }
 
@@ -3243,7 +3243,6 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
                                 del_gendisk(disk);
                         if (q)
                                 blk_cleanup_queue(q);
-                        put_disk(disk);
                 }
         }