diff options
Diffstat (limited to 'camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c')
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c index f043bfb..7394fee 100644 --- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c +++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c @@ -1258,7 +1258,7 @@ uint8_t get_num_of_cameras() int num_entities; snprintf(dev_name, sizeof(dev_name), "/dev/media%d", num_media_devices); dev_fd = open(dev_name, O_RDWR | O_NONBLOCK); - if (dev_fd <= 0) { + if (dev_fd < 0) { CDBG("Done discovering media devices\n"); break; } @@ -1268,14 +1268,14 @@ uint8_t get_num_of_cameras() if (rc < 0) { CDBG_ERROR("Error: ioctl media_dev failed: %s\n", strerror(errno)); close(dev_fd); - dev_fd = 0; + dev_fd = -1; num_cameras = 0; break; } if(strncmp(mdev_info.model, MSM_CAMERA_NAME, sizeof(mdev_info.model)) != 0) { close(dev_fd); - dev_fd = 0; + dev_fd = -1; continue; } @@ -1302,7 +1302,7 @@ uint8_t get_num_of_cameras() num_cameras++; close(dev_fd); - dev_fd = 0; + dev_fd = -1; } g_cam_ctrl.num_cam = num_cameras; @@ -1386,6 +1386,8 @@ mm_camera_vtbl_t * camera_open(uint8_t camera_idx) /* initialize camera obj */ memset(cam_obj, 0, sizeof(mm_camera_obj_t)); + cam_obj->ctrl_fd = -1; + cam_obj->ds_fd = -1; cam_obj->ref_count++; cam_obj->my_hdl = mm_camera_util_generate_handler(camera_idx); cam_obj->vtbl.camera_handle = cam_obj->my_hdl; /* set handler */ |