---

yaml --- r: 75200 b: refs/heads/master c: 52ef2ed h: refs/heads/master v: v3
git-mirror · Dec 24, 2007 · 3f6d1de · 3f6d1de
1 parent fdf0e96
commit 3f6d1de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b481b23868928443931190c91e7c06e23913149d
+refs/heads/master: 52ef2ed08164dbde07203ee245584d59ebf5c487
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
@@ -1112,8 +1112,11 @@ static ide_startstop_t cdrom_read_intr (ide_drive_t *drive)
 	 */
 	if (dma) {
 		info->dma = 0;
-		if ((dma_error = HWIF(drive)->ide_dma_end(drive)))
+		dma_error = HWIF(drive)->ide_dma_end(drive);
+		if (dma_error) {
+			printk(KERN_ERR "%s: DMA read error\n", drive->name);
 			ide_dma_off(drive);
+		}
 	}
 
 	if (cdrom_decode_status(drive, 0, &stat))