2005-09-09 22:08:12

by Mike Miller

[permalink] [raw]
Subject: [PATCH 5/8] cciss: bug fix in cciss_remove_one

Patch 5 of 8
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.
Please consider this for inclusion.

Signed-off-by: Mike Miller <[email protected]>

cciss.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
--------------------------------------------------------------------------------
diff -burNp lx2613-p004/drivers/block/cciss.c lx2613/drivers/block/cciss.c
--- lx2613-p004/drivers/block/cciss.c 2005-09-09 16:09:13.362617000 -0500
+++ lx2613/drivers/block/cciss.c 2005-09-09 16:10:55.801044320 -0500
@@ -3097,9 +3097,10 @@ static void __devexit cciss_remove_one (
/* 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),