From: Borislav Petkov Date: Fri, 2 Jan 2009 15:12:52 +0000 (+0100) Subject: ide-atapi: setup dma for ide-cd X-Git-Tag: upstream/snapshot3+hdmi~21128^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f02ff06b4d33aba50ce5157c23e99cd21d447ee;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ide-atapi: setup dma for ide-cd There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz --- 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_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);