1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
index 1c09e549c423..ed1496845a93 100644
--- a/drivers/ide/trm290.c
+++ b/drivers/ide/trm290.c
@@ -176,18 +176,12 @@ static void trm290_selectproc (ide_drive_t *drive)
         trm290_prepare_drive(drive, !!(drive->dev_flags & IDE_DFLAG_USING_DMA));
 }
 
-static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command)
-{
-        ide_execute_command(drive, command, &ide_dma_intr, WAIT_CMD, NULL);
-}
-
-static int trm290_dma_setup(ide_drive_t *drive)
+static int trm290_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         ide_hwif_t *hwif = drive->hwif;
-        struct request *rq = hwif->rq;
         unsigned int count, rw;
 
-        if (rq_data_dir(rq)) {
+        if (cmd->tf_flags & IDE_TFLAG_WRITE) {
 #ifdef TRM290_NO_DMA_WRITES
                 /* always use PIO for writes */
                 trm290_prepare_drive(drive, 0); /* select PIO xfer */
@@ -197,7 +191,9 @@ static int trm290_dma_setup(ide_drive_t *drive)
         } else
                 rw = 2;
 
-        if (!(count = ide_build_dmatable(drive, rq))) {
+        count = ide_build_dmatable(drive, cmd);
+        if (count == 0) {
+                ide_map_sg(drive, cmd);
                 /* try PIO instead of DMA */
                 trm290_prepare_drive(drive, 0); /* select PIO xfer */
                 return 1;
@@ -314,7 +310,6 @@ static const struct ide_port_ops trm290_port_ops = {
 static struct ide_dma_ops trm290_dma_ops = {
         .dma_host_set           = trm290_dma_host_set,
         .dma_setup              = trm290_dma_setup,
-        .dma_exec_cmd           = trm290_dma_exec_cmd,
         .dma_start              = trm290_dma_start,
         .dma_end                = trm290_dma_end,
         .dma_test_irq           = trm290_dma_test_irq,