[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 a9e33db..e34104d 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1146,7 +1146,6 @@
del_gendisk(disk);
if (q)
blk_cleanup_queue(q);
- put_disk(disk);
}
}
@@ -1467,7 +1466,6 @@
del_gendisk(disk);
if (q)
blk_cleanup_queue(q);
- put_disk(disk);
}
}
@@ -3243,7 +3241,6 @@
del_gendisk(disk);
if (q)
blk_cleanup_queue(q);
- put_disk(disk);
}
}