summaryrefslogtreecommitdiff
path: root/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
diff options
context:
space:
mode:
Diffstat (limited to 'camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c')
-rwxr-xr-xcamera/QCamera2/stack/mm-camera-interface/src/mm_camera.c24
1 files changed, 12 insertions, 12 deletions
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 5417f25..89dc2de 100755
--- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
+++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
@@ -254,7 +254,7 @@ int32_t mm_camera_open(mm_camera_obj_t *my_obj)
n_try--;
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) || (n_try <= 0 )) {
CDBG_HIGH("%s: opened, break out while loop", __func__);
break;
}
@@ -263,7 +263,7 @@ int32_t mm_camera_open(mm_camera_obj_t *my_obj)
usleep(sleep_msec * 1000);
}while (n_try > 0);
- if (my_obj->ctrl_fd <= 0) {
+ if (my_obj->ctrl_fd < 0) {
CDBG_ERROR("%s: cannot open control fd of '%s' (%s)\n",
__func__, dev_name, strerror(errno));
rc = -1;
@@ -276,7 +276,7 @@ int32_t mm_camera_open(mm_camera_obj_t *my_obj)
n_try--;
my_obj->ds_fd = mm_camera_socket_create(cam_idx, MM_CAMERA_SOCK_TYPE_UDP);
CDBG("%s: ds_fd = %d, errno = %d", __func__, my_obj->ds_fd, errno);
- if((my_obj->ds_fd > 0) || (n_try <= 0 )) {
+ if((my_obj->ds_fd >= 0) || (n_try <= 0 )) {
CDBG("%s: opened, break out while loop", __func__);
break;
}
@@ -285,7 +285,7 @@ int32_t mm_camera_open(mm_camera_obj_t *my_obj)
usleep(sleep_msec * 1000);
} while (n_try > 0);
- if (my_obj->ds_fd <= 0) {
+ if (my_obj->ds_fd < 0) {
CDBG_ERROR("%s: cannot open domain socket fd of '%s'(%s)\n",
__func__, dev_name, strerror(errno));
rc = -1;
@@ -315,13 +315,13 @@ int32_t mm_camera_open(mm_camera_obj_t *my_obj)
return rc;
on_error:
- if (my_obj->ctrl_fd > 0) {
+ if (my_obj->ctrl_fd >= 0) {
close(my_obj->ctrl_fd);
- my_obj->ctrl_fd = 0;
+ my_obj->ctrl_fd = -1;
}
- if (my_obj->ds_fd > 0) {
+ if (my_obj->ds_fd >= 0) {
mm_camera_socket_close(my_obj->ds_fd);
- my_obj->ds_fd = 0;
+ my_obj->ds_fd = -1;
}
/* we do not need to unlock cam_lock here before return
@@ -354,13 +354,13 @@ int32_t mm_camera_close(mm_camera_obj_t *my_obj)
CDBG("%s : Close evt cmd Thread in Cam Close",__func__);
mm_camera_cmd_thread_release(&my_obj->evt_thread);
- if(my_obj->ctrl_fd > 0) {
+ if(my_obj->ctrl_fd >= 0) {
close(my_obj->ctrl_fd);
- my_obj->ctrl_fd = 0;
+ my_obj->ctrl_fd = -1;
}
- if(my_obj->ds_fd > 0) {
+ if(my_obj->ds_fd >= 0) {
mm_camera_socket_close(my_obj->ds_fd);
- my_obj->ds_fd = 0;
+ my_obj->ds_fd = -1;
}
pthread_mutex_destroy(&my_obj->msg_lock);