]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ide-atapi: setup dma for ide-cd
authorBorislav Petkov <petkovbb@googlemail.com>
Fri, 2 Jan 2009 15:12:52 +0000 (16:12 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 2 Jan 2009 15:12:52 +0000 (16:12 +0100)
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

index b6e0aac68938a7002a136c24b9c10eebcbb5f396..74273fdc882740a1b138b1e45c47d22533aa8a0c 100644 (file)
@@ -575,8 +575,9 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
                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);