diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 20:05:45 +0100 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 20:05:45 +0100 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/block/loop.c | |
| parent | [SCSI] eliminate rphy allocation in favour of expander/end device allocation (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| download | linux-d04cdb64212eb5ae6a98026a97dda626e40e8e9a.tar.xz linux-d04cdb64212eb5ae6a98026a97dda626e40e8e9a.zip | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/block/loop.c')
| -rw-r--r-- | drivers/block/loop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 5f6d1a5cce11..0010704739e3 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1307,7 +1307,7 @@ static int __init loop_init(void) out_mem4: while (i--) - blk_put_queue(loop_dev[i].lo_queue); + blk_cleanup_queue(loop_dev[i].lo_queue); devfs_remove("loop"); i = max_loop; out_mem3: @@ -1328,7 +1328,7 @@ static void loop_exit(void) for (i = 0; i < max_loop; i++) { del_gendisk(disks[i]); - blk_put_queue(loop_dev[i].lo_queue); + blk_cleanup_queue(loop_dev[i].lo_queue); put_disk(disks[i]); } devfs_remove("loop"); |