commit 4f02ff06b4d33aba50ce5157c23e99cd21d447ee
author Borislav Petkov <petkovbb@googlemail.com> Fri Jan 02 16:12:52 2009 +0100
committer Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Fri Jan 02 16:12:52 2009 +0100
tree 1b163052d0fa6c03f7facfac7a320798e563d835
parent ed48554fad7091b9613b967462f082bf1a9cb035

ide-atapi: setup dma for ide-cd

There should be no functional change resulting from this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/ide-atapi.c

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index b6e0aac..74273fd 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -575,8 +575,9 @@
 		ide_dma_off(drive);
 	}
 
-	if ((pc->flags & PC_FLAG_DMA_OK) &&
-	    (drive->dev_flags & IDE_DFLAG_USING_DMA)) {
+	if (((pc->flags & PC_FLAG_DMA_OK) &&
+		(drive->dev_flags & IDE_DFLAG_USING_DMA)) ||
+	    drive->dma) {
 		if (scsi)
 			hwif->sg_mapped = 1;
 		drive->dma = !hwif->dma_ops->dma_setup(drive);