diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/block/pktcdvd.c | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/block/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index bc9b2bcd7dba..476a5b553f34 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -2514,7 +2514,7 @@ static int pkt_setup_dev(struct pkt_ctrl_command *ctrl_cmd) | |||
| 2514 | return 0; | 2514 | return 0; |
| 2515 | 2515 | ||
| 2516 | out_new_dev: | 2516 | out_new_dev: |
| 2517 | blk_put_queue(disk->queue); | 2517 | blk_cleanup_queue(disk->queue); |
| 2518 | out_mem2: | 2518 | out_mem2: |
| 2519 | put_disk(disk); | 2519 | put_disk(disk); |
| 2520 | out_mem: | 2520 | out_mem: |
| @@ -2555,7 +2555,7 @@ static int pkt_remove_dev(struct pkt_ctrl_command *ctrl_cmd) | |||
| 2555 | DPRINTK("pktcdvd: writer %s unmapped\n", pd->name); | 2555 | DPRINTK("pktcdvd: writer %s unmapped\n", pd->name); |
| 2556 | 2556 | ||
| 2557 | del_gendisk(pd->disk); | 2557 | del_gendisk(pd->disk); |
| 2558 | blk_put_queue(pd->disk->queue); | 2558 | blk_cleanup_queue(pd->disk->queue); |
| 2559 | put_disk(pd->disk); | 2559 | put_disk(pd->disk); |
| 2560 | 2560 | ||
| 2561 | pkt_devs[idx] = NULL; | 2561 | pkt_devs[idx] = NULL; |