---

yaml --- r: 139419 b: refs/heads/master c: 4a3d8cf h: refs/heads/master i: 139417: 7066277 139415: ad11483 v: v3
git-mirror · Mar 31, 2009 · 6c23249 · 6c23249
1 parent aed5f35
commit 6c23249
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git 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
@@ -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;
 	}