浏览代码

Merge "msm: camera: req_mgr: Rearrange state change sequence" into camera-kernel.lnx.5.0

Savita Patted 3 年之前
父节点
当前提交
3c4809d109
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/cam_req_mgr/cam_req_mgr_dev.c

+ 1 - 1
drivers/cam_req_mgr/cam_req_mgr_dev.c

@@ -836,7 +836,6 @@ static int cam_req_mgr_component_master_bind(struct device *dev)
 		goto req_mgr_core_fail;
 		goto req_mgr_core_fail;
 	}
 	}
 
 
-	g_dev.state = true;
 	INIT_LIST_HEAD(&cam_req_mgr_ordered_sd_list);
 	INIT_LIST_HEAD(&cam_req_mgr_ordered_sd_list);
 
 
 	if (g_cam_req_mgr_timer_cachep == NULL) {
 	if (g_cam_req_mgr_timer_cachep == NULL) {
@@ -851,6 +850,7 @@ static int cam_req_mgr_component_master_bind(struct device *dev)
 	}
 	}
 
 
 	CAM_DBG(CAM_CRM, "All probes done, binding slave components");
 	CAM_DBG(CAM_CRM, "All probes done, binding slave components");
+	g_dev.state = true;
 	rc = component_bind_all(dev, NULL);
 	rc = component_bind_all(dev, NULL);
 	if (rc) {
 	if (rc) {
 		CAM_ERR(CAM_CRM,
 		CAM_ERR(CAM_CRM,