Merge 51905b4794b21471cf74bd578256e856134478b8 on remote branch

Change-Id: If0d85014bbc6e8c8bb84456909b3f2375df05298
diff --git a/1.1/libboot_control_qti/libboot_control_qti.cpp b/1.1/libboot_control_qti/libboot_control_qti.cpp
index b21a958..81e7f03 100644
--- a/1.1/libboot_control_qti/libboot_control_qti.cpp
+++ b/1.1/libboot_control_qti/libboot_control_qti.cpp
@@ -589,10 +589,10 @@
 	for (i = 0; i < ARRAY_SIZE(ptn_list); i++) {
 		//XBL, XBL_CFG, MULTIIMGOEM, MULTIIMGQTI are handled differrently
                //for ufs devices so ignore them.
-		if (is_ufs && (!strncmp(ptn_list[i],PTN_XBL,strlen(PTN_XBL))
-		    || !strncmp(ptn_list[i],PTN_XBL_CFG,strlen(PTN_XBL_CFG))
-                    || !strncmp(ptn_list[i],PTN_MULTIIMGOEM,strlen(PTN_MULTIIMGOEM))
-                    || !strncmp(ptn_list[i],PTN_MULTIIMGQTI,strlen(PTN_MULTIIMGQTI))))
+		if (is_ufs && (!strncmp(ptn_list[i],PTN_XBL,strlen(ptn_list[i]))
+		    || !strncmp(ptn_list[i],PTN_XBL_CFG,strlen(ptn_list[i]))
+                    || !strncmp(ptn_list[i],PTN_MULTIIMGOEM,strlen(ptn_list[i]))
+                    || !strncmp(ptn_list[i],PTN_MULTIIMGQTI,strlen(ptn_list[i]))))
 				continue;
 		//The partition list will be the list of _a partitions
 		string cur_ptn = ptn_list[i];