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

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

Merge "msm: camera: icp: FW init response timeout fix" into dev/msm-4.9-camx

parents e88a3e6f b350a646

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
@@ -2539,10 +2539,10 @@ static int cam_icp_mgr_icp_resume(struct cam_icp_hw_mgr *hw_mgr) 
	if (hw_mgr->fw_download  == false) {

		CAM_DBG(CAM_ICP, "Downloading FW");

		mutex_unlock(&hw_mgr->hw_mgr_mutex);

		cam_icp_mgr_hw_open(hw_mgr, &downloadFromResume);

		rc = cam_icp_mgr_hw_open(hw_mgr, &downloadFromResume);

		mutex_lock(&hw_mgr->hw_mgr_mutex);

		CAM_DBG(CAM_ICP, "FW Download Done Exit");

		return 0;

		return rc;

	}



	rc = a5_dev_intf->hw_ops.init(a5_dev_intf->hw_priv, NULL, 0);