From c33ac911ad7ede5c5df92952b9da404a6791af2f Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 1 Feb 2008 23:09:17 +0100
Subject: [PATCH] --- yaml --- r: 82075 b: refs/heads/master c:
 eba15fba1f046d25c663d294fc919ab59cec3e9c h: refs/heads/master i:   82073:
 88c44615b132c922b13f585804890d39aee6c640   82071:
 db42d289a9cfdcf693d52c9bc3df641bc020d067 v: v3

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

diff --git a/[refs] b/[refs]
index f8a4da2dc2b4..5bb8d701877e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1071e628bc769174c3e2df7827a2a8ad05aea67
+refs/heads/master: eba15fba1f046d25c663d294fc919ab59cec3e9c
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
index cbe4f1a04c14..c638d057f910 100644
--- a/trunk/drivers/ide/ide-cd.c
+++ b/trunk/drivers/ide/ide-cd.c
@@ -1674,6 +1674,11 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 	if (dma) {
 		info->dma = 0;
 		dma_error = HWIF(drive)->ide_dma_end(drive);
+		if (dma_error) {
+			printk(KERN_ERR "%s: DMA %s error\n", drive->name,
+					rq_data_dir(rq) ? "write" : "read");
+			ide_dma_off(drive);
+		}
 	}
 
 	if (cdrom_decode_status(drive, 0, &stat))
@@ -1683,11 +1688,8 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 	 * using dma, transfer is complete now
 	 */
 	if (dma) {
-		if (dma_error) {
-			printk(KERN_ERR "ide-cd: dma error\n");
-			ide_dma_off(drive);
+		if (dma_error)
 			return ide_error(drive, "dma error", stat);
-		}
 
 		spin_lock_irqsave(&ide_lock, flags);
 		if (__blk_end_request(rq, 0, rq->data_len))