commit 2d87d291cbc396b606b985492acc1fc90a788d74
author Tianshu Qiu <tian.shu.qiu@intel.com> Tue Dec 22 11:21:46 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Mon Dec 28 08:00:05 2020 +0000
tree 68bc34b7cd6575e3a0440df98a984b6a0c7d5978
parent cc7a5d609b130e96d0005029318b000b35747f49

camera: intel: ipu6: Fix bug on failing to open camera

When fail to read /dev/media, it restarts camera service.

BUG=b:149068439, b:149068672
TEST=Full tested pass for camera functions.

Change-Id: I19684100a1ca1ebc0565e847d85d8b44b911c94f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2600371
Tested-by: Tianshu Qiu <tian.shu.qiu@intel.com>
Reviewed-by: Ren-Pei Zeng <kamesan@chromium.org>
Commit-Queue: Ren-Pei Zeng <kamesan@chromium.org>

camera/hal/intel/ipu6/src/platformdata/CameraParser.cpp

diff --git a/camera/hal/intel/ipu6/src/platformdata/CameraParser.cpp b/camera/hal/intel/ipu6/src/platformdata/CameraParser.cpp
index 893a7b0..d5cffdd 100644
--- a/camera/hal/intel/ipu6/src/platformdata/CameraParser.cpp
+++ b/camera/hal/intel/ipu6/src/platformdata/CameraParser.cpp
@@ -45,8 +45,12 @@
     mMC(mc),
     mMetadataCache(nullptr) {
     LOGXML("@%s", __func__);
-    CheckError(mc == nullptr || cfg == nullptr, VOID_VALUE,
-               "@%s, passed parameters are wrong, mc:%p, data:%p", __func__, mc, cfg);
+    CheckError(cfg == nullptr, VOID_VALUE, "@%s, cfg is nullptr", __func__);
+
+    // Get common data from libcamhal_profile.xml
+    int ret = getDataFromXmlFile(LIBCAMHAL_PROFILE_NAME);
+    CheckError(ret != OK, VOID_VALUE, "Failed to get libcamhal profile data frome %s",
+               LIBCAMHAL_PROFILE_NAME);
 
     mGenericStaticMetadataToTag = {
         {"ae.lockAvailable", CAMERA_AE_LOCK_AVAILABLE},
@@ -95,13 +99,9 @@
         {"sync.maxLatency", CAMERA_SYNC_MAX_LATENCY},
     };
 
+    // Get sensor data from sensor xml.
+    CheckError(mc == nullptr, VOID_VALUE, "@%s, mc is nullptr", __func__);
     mMetadataCache = new long[mMetadataCacheSize];
-
-    // Get common data from libcamhal_profile.xml
-    int ret = getDataFromXmlFile(LIBCAMHAL_PROFILE_NAME);
-    CheckError(ret != OK, VOID_VALUE, "Failed to get libcamhal profile data frome %s",
-               LIBCAMHAL_PROFILE_NAME);
-
     getSensorDataFromXmlFile();
 
     if(gLogLevel & CAMERA_DEBUG_LOG_LEVEL2) {