From 6c23249262f7aa0df06616857335e81586505a50 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 31 Mar 2009 20:15:15 +0200 Subject: [PATCH] --- yaml --- r: 139419 b: refs/heads/master c: 4a3d8cf48c7baf3439aed06c847cd4562adfc468 h: refs/heads/master i: 139417: 7066277bccea63b8150838fcd79dfd6eaf22d157 139415: ad11483c6dd2501d4fdeb92653740781b370200c v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index ecc14557cbd8..cfe1dcd6d7ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7ec89994fec4353d5b4251213bdfa7b1a68c26b +refs/heads/master: 4a3d8cf48c7baf3439aed06c847cd4562adfc468 diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c index 7fdfb55011a6..11d8d5b870b7 100644 --- a/trunk/drivers/ide/ide-cd.c +++ b/trunk/drivers/ide/ide-cd.c @@ -657,16 +657,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) if (dma) { if (dma_error) return ide_error(drive, "dma error", stat); - if (blk_fs_request(rq)) { - ide_complete_rq(drive, 0, rq->nr_sectors - ? (rq->nr_sectors << 9) : ide_rq_bytes(rq)); - return ide_stopped; - } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) { - ide_complete_rq(drive, 0, 512); - return ide_stopped; - } - if (blk_pc_request(rq) == 0 && uptodate == 0) - rq->cmd_flags |= REQ_FAILED; + uptodate = 1; goto out_end; }