# HG changeset patch
# User Space Falcon <falcon@ivan.Harhan.ORG>
# Date 1435618647 0
# Node ID eed6dc6aca3cfb4bac21cc6a7d1299dd5987acba
# Parent  f3fba126778a5d6d7d748582208885d7bf69aa8e
gsm-fw/comlib/cl_imei.c: hell with TI's different return code types

diff -r f3fba126778a -r eed6dc6aca3c gsm-fw/comlib/cl_imei.c
--- a/gsm-fw/comlib/cl_imei.c	Mon Jun 29 21:58:15 2015 +0000
+++ b/gsm-fw/comlib/cl_imei.c	Mon Jun 29 22:57:27 2015 +0000
@@ -193,10 +193,12 @@
 */
 extern BYTE cl_get_imeisv(USHORT imeiBufSize, UBYTE *imeiBufPtr, UBYTE imeiType)
 {
+#if CONFIG_MOKOFFS
   USHORT ret;
-#if CONFIG_MOKOFFS
   UBYTE version;
   UBYTE buf[SIZE_EF_IMEI];
+#else
+  BYTE ret;
 #endif
 
   TRACE_FUNCTION("cl_get_imeisv()");
@@ -258,8 +260,7 @@
    * hard-coded fallback and error indication
    */
 
-  ret = ffs_file_read(CL_IMEI_FFS_PATH, imeiBufPtr, CL_IMEI_SIZE);
-  if (ret >= EFFS_OK) {
+  if (ffs_file_read(CL_IMEI_FFS_PATH, imeiBufPtr, CL_IMEI_SIZE) >= EFFS_OK) {
     memcpy(stored_imei, imeiBufPtr, CL_IMEI_SIZE);
     imei_flag = 1;
     return CL_IMEI_OK;