commit 25124967c60f7e59a0dd51346a2394be6cc887f2
author Mansoor Aftab <maftab@codeaurora.org> Thu Mar 19 15:04:52 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Mar 25 18:49:22 2015 -0700
tree 378893ad59eccd9d07be1d2830f45d941f0acb07
parent 87667771cd5cac1f178ad255e8704d365bdf8fbc

DO NOT MERGE: mm-camera-interface: Retry in case of timeouts

Incase of delayed daemon start there is possibility of
timeout, HAL should re-attempt in those cases to allow
time for daemon to start.

Bug: 19796176
Change-Id: I1920fb32652e944ca599efef7801045b60c42ca8

camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c

diff --git a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
index 9b01976..3adcb61 100644
--- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
+++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
@@ -254,14 +254,15 @@
 
     do{
         n_try--;
+        errno = 0;
         my_obj->ctrl_fd = open(dev_name, O_RDWR | O_NONBLOCK);
         CDBG("%s:  ctrl_fd = %d, errno == %d", __func__, my_obj->ctrl_fd, errno);
-        if((my_obj->ctrl_fd >= 0) || (errno != EIO) || (n_try <= 0 )) {
+        if((my_obj->ctrl_fd >= 0) || (errno != EIO && errno != ETIMEDOUT) || (n_try <= 0 )) {
             CDBG_HIGH("%s:  opened, break out while loop", __func__);
             break;
         }
-        CDBG_HIGH("%s:failed with I/O error retrying after %d milli-seconds",
-             __func__, sleep_msec);
+        ALOGE("%s:Failed with %s error, retrying after %d milli-seconds",
+             __func__, strerror(errno), sleep_msec);
         usleep(sleep_msec * 1000);
     }while (n_try > 0);