summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorJody McIntyre <scjody@modernduck.com>2005-12-13 07:34:32 +0300
committerJody McIntyre <scjody@modernduck.com>2005-12-13 07:34:32 +0300
commit525352eb6d355bef6adf597252fc6d04f2dbe66c (patch)
tree4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/block
parentd51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff)
parent0e670506668a43e1355b8f10c33d081a676bd521 (diff)
downloadlinux-525352eb6d355bef6adf597252fc6d04f2dbe66c.tar.xz
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index a9e33db46e68..e34104d32637 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);
}
}