diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2018-03-16 10:06:19 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-03-16 10:06:19 +0100 |
| commit | f09a7931bcbc29a188d24c8b8f9523587c428204 (patch) | |
| tree | 396b3686613b49aab9ddf8eb5b426ae95740aa8b /drivers/mmc | |
| parent | a677b67b6994e491f564f9ef773c49a1cd0d9720 (diff) | |
| parent | 47b7de2f6c18f75d1f2716efe752cba43f32a626 (diff) | |
| download | linux-f09a7931bcbc29a188d24c8b8f9523587c428204.tar.gz linux-f09a7931bcbc29a188d24c8b8f9523587c428204.tar.xz | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index e7de83805e60..29a1afa81f66 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -540,6 +540,7 @@ static int dw_mci_idmac_init(struct dw_mci *host) (sizeof(struct idmac_desc_64addr) * (i + 1))) >> 32; /* Initialize reserved and buffer size fields to "0" */ + p->des0 = 0; p->des1 = 0; p->des2 = 0; p->des3 = 0; @@ -562,6 +563,7 @@ static int dw_mci_idmac_init(struct dw_mci *host) i++, p++) { p->des3 = cpu_to_le32(host->sg_dma + (sizeof(struct idmac_desc) * (i + 1))); + p->des0 = 0; p->des1 = 0; } @@ -1777,8 +1779,8 @@ static bool dw_mci_reset(struct dw_mci *host) } if (host->use_dma == TRANS_MODE_IDMAC) - /* It is also recommended that we reset and reprogram idmac */ - dw_mci_idmac_reset(host); + /* It is also required that we reinit idmac */ + dw_mci_idmac_init(host); ret = true; |