From 9bff8ccd0fa8f29d3fa92e4505d9cdd7a72d0f12 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Fri, 8 Dec 2023 12:11:44 +0800
Subject: [PATCH] camerad: fix use of uninitialized `CameraInfo` in
 `camera_open()` (#30642)

---
 system/camerad/cameras/camera_qcom2.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/camerad/cameras/camera_qcom2.cc b/system/camerad/cameras/camera_qcom2.cc
index e6ca0fff94..d5fd643bf1 100644
--- a/system/camerad/cameras/camera_qcom2.cc
+++ b/system/camerad/cameras/camera_qcom2.cc
@@ -597,8 +597,6 @@ void CameraState::camera_init(MultiCameraState *s, VisionIpcServer * v, int came
   request_id_last = 0;
   skipped = true;
 
-  camera_set_parameters();
-
   buf.init(device_id, ctx, this, v, FRAME_BUF_COUNT, yuv_type);
   camera_map_bufs(s);
 }
@@ -634,6 +632,8 @@ void CameraState::camera_open(MultiCameraState *multi_cam_state_, int camera_num
     return;
   }
 
+  camera_set_parameters();
+
   // create session
   struct cam_req_mgr_session_info session_info = {};
   ret = do_cam_control(multi_cam_state->video0_fd, CAM_REQ_MGR_CREATE_SESSION, &session_info, sizeof(session_info));