Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67fe356b authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Reduce abort FW timeout" into dev/msm-4.9-camx

parents 7b377c6e 7747cbf0

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+2 −2
Original line number Diff line number Diff line
@@ -2098,7 +2098,7 @@ static int cam_icp_mgr_abort_handle( 
	int rc = 0;

	unsigned long rem_jiffies;

	size_t packet_size;

	int timeout = 5000;

	int timeout = 100;

	struct hfi_cmd_work_data *task_data;

	struct hfi_cmd_ipebps_async *abort_cmd;

	struct crm_workq_task *task;
@@ -2161,7 +2161,7 @@ static int cam_icp_mgr_destroy_handle( 
	struct cam_icp_hw_ctx_data *ctx_data)

{

	int rc = 0;

	int timeout = 5000;

	int timeout = 100;

	unsigned long rem_jiffies;

	size_t packet_size;

	struct hfi_cmd_work_data *task_data;