Merge "libcamera: Fix initial flash mode in camera HAL" into jellybean

tchaari · Sep 15, 2012 · fc0deb7 · fc0deb7
2 parents 00a0bbf + b661312
commit fc0deb7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp
@@ -840,6 +840,11 @@ int SecCamera::startPreview(void)
         CHECK(ret);
     }
 
+#ifdef HAVE_FLASH
+    ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_FLASH_MODE, m_params->flash_mode);
+    CHECK(ret);
+#endif
+
     // It is a delay for a new frame, not to show the previous bigger ugly picture frame.
     ret = fimc_poll(&m_events_c);
     CHECK(ret);