diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/ide-cd.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 7fdfb55011a6..11d8d5b870b7 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -657,16 +657,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) | |||
657 | if (dma) { | 657 | if (dma) { |
658 | if (dma_error) | 658 | if (dma_error) |
659 | return ide_error(drive, "dma error", stat); | 659 | return ide_error(drive, "dma error", stat); |
660 | if (blk_fs_request(rq)) { | 660 | uptodate = 1; |
661 | ide_complete_rq(drive, 0, rq->nr_sectors | ||
662 | ? (rq->nr_sectors << 9) : ide_rq_bytes(rq)); | ||
663 | return ide_stopped; | ||
664 | } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) { | ||
665 | ide_complete_rq(drive, 0, 512); | ||
666 | return ide_stopped; | ||
667 | } | ||
668 | if (blk_pc_request(rq) == 0 && uptodate == 0) | ||
669 | rq->cmd_flags |= REQ_FAILED; | ||
670 | goto out_end; | 661 | goto out_end; |
671 | } | 662 | } |
672 | 663 | ||