From: lintao <lintao@rock-chips.com>
Date: Wed, 22 Oct 2014 00:13:05 +0000 (+0800)
Subject: mmc: v2: fix wrong mszs calculation for edmac.
X-Git-Tag: firefly_0821_release~4546
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=775d7173a0007a5619311846fd29a0ff3a7c8b49;p=firefly-linux-kernel-4.4.55.git

mmc: v2: fix wrong mszs calculation for edmac.
	Change log v2: update logical operation for FIFOTH
---

diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c
index 3a7dc971f8a1..dba448bf52f4 100755
--- a/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@ -627,7 +627,7 @@ static void dw_mci_edmac_start_dma(struct dw_mci *host, unsigned int sg_len)
 
         /* Match FIFO dma burst MSIZE with external dma config*/
         fifoth_val = mci_readl(host, FIFOTH);
-        mburst = mszs[(fifoth_val >> 28) && 0x7];
+        mburst = mszs[(fifoth_val >> 28) & 0x7];
 
         /* edmac limit burst to 16 */
         slave_config.dst_maxburst = (mburst > 16) ? 16 : mburst;
@@ -4282,4 +4282,4 @@ MODULE_AUTHOR("NXP Semiconductor VietNam");
 MODULE_AUTHOR("Imagination Technologies Ltd");
 MODULE_AUTHOR("Shawn Lin <lintao@rock-chips.com>");
 MODULE_AUTHOR("Bangwang Xie <xbw@rock-chips.com>");
-MODULE_LICENSE("GPL v2");
\ No newline at end of file
+MODULE_LICENSE("GPL v2");