浏览代码

Merge "msm: camera: reqmgr: Fix timing issue while destroying the session" into camera-kernel.lnx.4.0

Haritha Chintalapati 4 年之前
父节点
当前提交
792be0d9c4
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/cam_req_mgr/cam_req_mgr_core.c

+ 2 - 2
drivers/cam_req_mgr/cam_req_mgr_core.c

@@ -3622,12 +3622,12 @@ static int __cam_req_mgr_unlink(struct cam_req_mgr_core_link *link)
 
 
 	mutex_lock(&link->lock);
 	mutex_lock(&link->lock);
 
 
-	/* Destroy workq of link */
-	cam_req_mgr_workq_destroy(&link->workq);
 	spin_lock_bh(&link->link_state_spin_lock);
 	spin_lock_bh(&link->link_state_spin_lock);
 	/* Destroy timer of link */
 	/* Destroy timer of link */
 	crm_timer_exit(&link->watchdog);
 	crm_timer_exit(&link->watchdog);
 	spin_unlock_bh(&link->link_state_spin_lock);
 	spin_unlock_bh(&link->link_state_spin_lock);
+	/* Destroy workq of link */
+	cam_req_mgr_workq_destroy(&link->workq);
 
 
 	/* Cleanup request tables and unlink devices */
 	/* Cleanup request tables and unlink devices */
 	__cam_req_mgr_destroy_link_info(link);
 	__cam_req_mgr_destroy_link_info(link);