Merge "msm: cam: reqmgr: Add list empty check for task list" into msm-4.9
diff --git a/drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_workq.c b/drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_workq.c
index 08466b1..1f6a97a 100644
--- a/drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_workq.c
+++ b/drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_workq.c
@@ -22,12 +22,16 @@
return NULL;
spin_lock(&workq->task.lock);
+ if (list_empty(&workq->task.empty_head))
+ goto end;
+
task = list_first_entry(&workq->task.empty_head,
struct crm_workq_task, entry);
if (task) {
atomic_sub(1, &workq->task.free_cnt);
list_del_init(&task->entry);
}
+end:
spin_unlock(&workq->task.lock);
return task;