From: Jens Axboe <axboe@suse.de>
Date: Mon, 12 Dec 2005 08:37:13 +0000 (-0800)
Subject: [PATCH] cciss: double put_disk()
X-Git-Tag: v2.6.15-rc6~130
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b4788f6d55548e587ced330ece711456f40ec8f1;p=linux-2.6-omap-h63xx.git

[PATCH] cciss: double put_disk()

This undoes the put_disk patch I sent in before.

If I had been paying attention I would have seen that we call put_disk
from free_hba during driver unload.  That's the only time we want to
call it.  If it's called from deregister disk we may remove the
controller (cNd0) unintentionally.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index a9e33db46e6..e34104d3263 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);
 		}
 	}
 
@@ -1467,7 +1466,6 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
 				del_gendisk(disk);
 			if (q)	
 				blk_cleanup_queue(q);
-			put_disk(disk);	
 		}
 	}
 
@@ -3243,7 +3241,6 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
 				del_gendisk(disk);
 			if (q)
 				blk_cleanup_queue(q);
-			put_disk(disk);
 		}
 	}