From cf23762c597f5959589bc2404ab6a07a105fd742 Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Tue, 13 Sep 2005 01:25:23 -0700 Subject: [PATCH] --- yaml --- r: 8765 b: refs/heads/master c: 6a445d3ba6b90ce13a843ad5d1a0867388b08096 h: refs/heads/master i: 8763: 2132a565c83ff1981119c8b731d609afae7d2601 v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 039bd34714cd..1f03d0ed6fc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33079b21978f478865068ee6a3c5807b6c6ecdbe +refs/heads/master: 6a445d3ba6b90ce13a843ad5d1a0867388b08096 diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index a12b95eef18e..49f05410a117 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/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),