diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-27 11:31:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-27 11:31:23 -0400 |
| commit | ac6e5fed31ccd1da18b8ef10542c3534bd2dbd38 (patch) | |
| tree | b21aae9f38bfccce73aed8cb86c291323512cc25 /drivers | |
| parent | 8e6e8221c78ed283a45f8598c65ffe4d287dcf42 (diff) | |
| parent | ca2ec9adc951cc3798e9b0c3773cdcc613232a22 (diff) | |
| download | blackbird-obmc-uboot-ac6e5fed31ccd1da18b8ef10542c3534bd2dbd38.tar.gz blackbird-obmc-uboot-ac6e5fed31ccd1da18b8ef10542c3534bd2dbd38.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/dw_mmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 74a2663c8b..af6e04aa28 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -121,7 +121,7 @@ static int dwmci_data_transfer(struct dwmci_host *host, struct mmc_data *data) if (host->fifo_mode && size) { if (data->flags == MMC_DATA_READ) { - if ((dwmci_readl(host, DWMCI_RINTSTS) && + if ((dwmci_readl(host, DWMCI_RINTSTS) & DWMCI_INTMSK_RXDR)) { len = dwmci_readl(host, DWMCI_STATUS); len = (len >> DWMCI_FIFO_SHIFT) & @@ -133,7 +133,7 @@ static int dwmci_data_transfer(struct dwmci_host *host, struct mmc_data *data) DWMCI_INTMSK_RXDR); } } else { - if ((dwmci_readl(host, DWMCI_RINTSTS) && + if ((dwmci_readl(host, DWMCI_RINTSTS) & DWMCI_INTMSK_TXDR)) { len = dwmci_readl(host, DWMCI_STATUS); len = fifo_depth - ((len >> |
