summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorMike Miller <mike.miller@hp.com>2005-09-13 01:25:23 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 08:22:30 -0700
commit6a445d3ba6b90ce13a843ad5d1a0867388b08096 (patch)
tree30a07d018d74fbd99d323d6d6a6e08cac3a1b767 /drivers/block
parent33079b21978f478865068ee6a3c5807b6c6ecdbe (diff)
downloadblackbird-op-linux-6a445d3ba6b90ce13a843ad5d1a0867388b08096.tar.gz
blackbird-op-linux-6a445d3ba6b90ce13a843ad5d1a0867388b08096.zip
[PATCH] cciss: bug fix in cciss_remove_one
This patch fixes a bug in cciss_remove_one. A set of braces was missing for the if statement causing an Oops on driver unload. Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index a12b95eef18e..49f05410a117 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3095,9 +3095,10 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
/* remove it from the disk list */
for (j = 0; j < NWD; j++) {
struct gendisk *disk = hba[i]->gendisk[j];
- if (disk->flags & GENHD_FL_UP)
- blk_cleanup_queue(disk->queue);
+ if (disk->flags & GENHD_FL_UP) {
del_gendisk(disk);
+ blk_cleanup_queue(disk->queue);
+ }
}
pci_free_consistent(hba[i]->pdev, NR_CMDS * sizeof(CommandList_struct),
OpenPOWER on IntegriCloud