diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:37 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:37 -0400 |
commit | e6830a86c260d73c6f370aa7ed17ee6c71e5ee05 (patch) | |
tree | c2c7d472184da1549852b86eef551609cddcbcbf /drivers/ide/ide-taskfile.c | |
parent | b109f526cabcd098131e770fd6232282bce147b4 (diff) |
ide: call ide_build_sglist() prior to ->dma_setup (v2)
* Re-map sg table if needed in ide_build_sglist().
* Move ide_build_sglist() call from ->dma_setup to its users.
* Un-export ide_build_sglist().
v2:
* Build fix for CONFIG_BLK_DEV_IDEDMA=n (noticed by Randy Dunlap).
There should be no functional changes caused by this patch.
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
-rw-r--r-- | drivers/ide/ide-taskfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 15bbfc1dcd28..925fb9241893 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -103,6 +103,7 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task) | |||
103 | return ide_started; | 103 | return ide_started; |
104 | default: | 104 | default: |
105 | if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 || | 105 | if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 || |
106 | ide_build_sglist(drive, hwif->rq) == 0 || | ||
106 | dma_ops->dma_setup(drive)) | 107 | dma_ops->dma_setup(drive)) |
107 | return ide_stopped; | 108 | return ide_stopped; |
108 | dma_ops->dma_exec_cmd(drive, tf->command); | 109 | dma_ops->dma_exec_cmd(drive, tf->command); |