commit e0276993cddf1c59a1ef66d210cbbd1a713de1a7
author Tom Rini <trini@konsulko.com> Mon Jun 27 11:31:23 2016 -0400
committer Tom Rini <trini@konsulko.com> Mon Jun 27 11:31:23 2016 -0400
tree b21aae9f38bfccce73aed8cb86c291323512cc25
parent 649d810f7d22f16a1741b8c7d7b3652a7f5d8fd5
parent 1d9c36f0e893b027a1b38b94c00c974310bac34a

Merge branch 'master' of git://git.denx.de/u-boot-samsung

drivers/mmc/dw_mmc.c

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 74a2663..af6e04a 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -121,7 +121,7 @@
 
 		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 @@
 						     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 >>