From dede930e3da18ec4bf3756c422d3a4469bfcebdb Mon Sep 17 00:00:00 2001
From: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Date: Tue, 19 Feb 2008 01:41:26 +0100
Subject: [PATCH] --- yaml --- r: 85787 b: refs/heads/master c:
 14e04c3f6e64bac468f0aa38c6d47aa95b60c074 h: refs/heads/master i:   85785:
 99d306f8db96e61bd1108af08184de0296b32568   85783:
 382d98e03ce40aaad1cbd19a515ed4391a76342c v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/ide/ide-cd.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eee650bbab7d..015aa12b5031 100644
--- 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
index 354c91d06a6d..310e497b5838 100644
--- 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);