---

yaml --- r: 85787 b: refs/heads/master c: 14e04c3 h: refs/heads/master i: 85785: 99d306f 85783: 382d98e v: v3
git-mirror · Feb 19, 2008 · dede930 · dede930
1 parent 7c38cd0
commit dede930
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e7d8d480259319649f7a2c230622b98758d1c83
+refs/heads/master: 14e04c3f6e64bac468f0aa38c6d47aa95b60c074
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
@@ -1207,9 +1207,13 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 end_request:
 	if (blk_pc_request(rq)) {
 		unsigned long flags;
+		unsigned int dlen = rq->data_len;
+
+		if (dma)
+			rq->data_len = 0;
 
 		spin_lock_irqsave(&ide_lock, flags);
-		if (__blk_end_request(rq, 0, rq->data_len))
+		if (__blk_end_request(rq, 0, dlen))
 			BUG();
 		HWGROUP(drive)->rq = NULL;
 		spin_unlock_irqrestore(&ide_lock, flags);