]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
mmc: msm_sdcc: Fix the dma exec function to use the proper delays
authorSan Mehat <san@google.com>
Thu, 3 Dec 2009 01:24:58 +0000 (17:24 -0800)
committerDaniel Walker <dwalker@codeaurora.org>
Thu, 18 Mar 2010 20:37:22 +0000 (13:37 -0700)
Signed-off-by: San Mehat <san@google.com>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
drivers/mmc/host/msm_sdcc.c

index 28899ee392e2e789b29a215560dfb40799f65fe9..8329fd650c5f03bf8d6e1a2422eaafd88cbd1862 100644 (file)
@@ -177,17 +177,18 @@ msmsdcc_start_command_exec(struct msmsdcc_host *host, u32 arg, u32 c) {
 static void
 msmsdcc_dma_exec_func(struct msm_dmov_cmd *cmd)
 {
-       struct msmsdcc_host *host = (struct msmsdcc_host *)cmd->data;
+       struct msmsdcc_host *host = (struct msmsdcc_host *)cmd->data;
 
-       writel(host->cmd_timeout, host->base + MMCIDATATIMER);
-       writel((unsigned int)host->curr.xfer_size, host->base + MMCIDATALENGTH);
-       writel(host->cmd_pio_irqmask, host->base + MMCIMASK1);
-       writel(host->cmd_datactrl, host->base + MMCIDATACTRL);
+       msmsdcc_writel(host, host->cmd_timeout, MMCIDATATIMER);
+       msmsdcc_writel(host, (unsigned int)host->curr.xfer_size, MMCIDATALENGTH);
+       msmsdcc_writel(host, host->cmd_pio_irqmask, MMCIMASK1);
+       msmsdcc_writel(host, host->cmd_datactrl, MMCIDATACTRL);
 
-       if (host->cmd_cmd) {
-               msmsdcc_start_command_exec(host,
-                       (u32)host->cmd_cmd->arg, (u32)host->cmd_c);
-       }
+       if (host->cmd_cmd) {
+               msmsdcc_start_command_exec(host,
+                                          (u32) host->cmd_cmd->arg,
+                                          (u32) host->cmd_c);
+       }
        host->dma.active = 1;
 }