diff options
author | Nathan Scott <nathans@bruce> | 2006-03-22 15:31:14 +1100 |
---|---|---|
committer | Nathan Scott <nathans@bruce> | 2006-03-22 15:31:14 +1100 |
commit | 4d74f423c722b8cadfabe087369200013b217b67 (patch) | |
tree | d62facddfdb0dfd89f3e61f4fc699cf2feb4b082 /drivers/block/loop.c | |
parent | bb19fba1937cb6ab2bb98ac893365f6ebf88ef1b (diff) | |
parent | e952f31bce6e9f64db01f607abc46529ba57ac9e (diff) |
Merge HEAD from ../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 5f6d1a5cce1..0010704739e 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"); |