commit 47f9037a00b33afa17e1b79ca59a609ab3783a66
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 07 21:20:12 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 07 21:20:12 2014 -0700
tree fc0c8c889ca8c66c5de31de543c096b052d8f82f
parent 790a436783781db128377ae1241bf738c638712c
parent 08bde37c25d2006ad05b1109e2553b8c31367cfa

Merge "platform: msm_shared: fix for fastboot erase aboot."

platform/msm_shared/mmc_wrapper.c

diff --git a/platform/msm_shared/mmc_wrapper.c b/platform/msm_shared/mmc_wrapper.c
index 276840b..c660a5f 100755
--- a/platform/msm_shared/mmc_wrapper.c
+++ b/platform/msm_shared/mmc_wrapper.c
@@ -357,6 +357,15 @@
 
 			blk_addr += unaligned_blks;
 			blk_count -= unaligned_blks;
+
+			head_unit = blk_addr / erase_unit_sz;
+			tail_unit = (blk_addr + blk_count - 1) / erase_unit_sz;
+
+			if (tail_unit - head_unit <= 1)
+			{
+				dprintf(INFO, "SDHCI unit erase not required\n");
+				return mmc_zero_out(dev, blk_addr, blk_count);
+			}
 		}
 
 		unaligned_blks = blk_count % erase_unit_sz;