Browse Source

Merge "msm: camera: reqmgr: Add checks before reporting the error" into camera-kernel.lnx.4.0

Haritha Chintalapati 4 năm trước cách đây
mục cha
commit
35c58f9297
1 tập tin đã thay đổi với 2 bổ sung2 xóa
  1. 2 2
      drivers/cam_req_mgr/cam_req_mgr_core.c

+ 2 - 2
drivers/cam_req_mgr/cam_req_mgr_core.c

@@ -1632,7 +1632,7 @@ static int __cam_req_mgr_process_req(struct cam_req_mgr_core_link *link,
 	struct cam_req_mgr_slot             *slot = NULL;
 	struct cam_req_mgr_req_queue        *in_q;
 	struct cam_req_mgr_core_session     *session;
-	struct cam_req_mgr_connected_device *dev;
+	struct cam_req_mgr_connected_device *dev = NULL;
 	struct cam_req_mgr_core_link        *tmp_link = NULL;
 	uint32_t                             max_retry = 0;
 
@@ -1758,7 +1758,7 @@ static int __cam_req_mgr_process_req(struct cam_req_mgr_core_link *link,
 		if (link->max_delay == 1)
 			max_retry++;
 
-		if (!link->wq_congestion) {
+		if (!link->wq_congestion && dev) {
 			link->retry_cnt++;
 			if (link->retry_cnt == max_retry) {
 				CAM_DBG(CAM_CRM,