summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2022-05-04 11:52:07 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2022-05-04 11:52:07 +0200
commit89877983ac60c1becf3cd6f161d2e2ac0aa6233a (patch)
treeabeac76f913c0baf841664956ac09342f9332a1f /drivers/mmc
parentdt-bindings: mmc: sdhci-of-dwcmhsc: Add rk3588 (diff)
parentmmc: sunxi-mmc: Fix DMA descriptors allocated above 32 bits (diff)
downloadlinux-89877983ac60c1becf3cd6f161d2e2ac0aa6233a.tar.xz
linux-89877983ac60c1becf3cd6f161d2e2ac0aa6233a.zip
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sunxi-mmc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index 0e8fbf4957d8..b16e12e62e72 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -377,8 +377,9 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host,
pdes[i].buf_addr_ptr1 =
cpu_to_le32(sg_dma_address(&data->sg[i]) >>
host->cfg->idma_des_shift);
- pdes[i].buf_addr_ptr2 = cpu_to_le32((u32)next_desc >>
- host->cfg->idma_des_shift);
+ pdes[i].buf_addr_ptr2 =
+ cpu_to_le32(next_desc >>
+ host->cfg->idma_des_shift);
}
pdes[0].config |= cpu_to_le32(SDXC_IDMAC_DES0_FD);