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

Commit ba377d7e authored by Krishnankutty Kolathappilly's avatar Krishnankutty Kolathappilly Committed by Gerrit - the friendly Code Review server
Browse files

Revert "msm: camera: HW CDM reset failure workaround" 



Ignoring the error is not required as firmware avoids resetting
cdm irq and prevents invalid status when cdm driver checks.

This reverts commit 81851c7d.

Change-Id: I7ff9616a17eaf4270572726bb9db193159ba2409
Signed-off-by: default avatarKrishnankutty Kolathappilly <kkolatha@codeaurora.org>
parent 57707021

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_hw_core.c

+0 −12
Original line number Diff line number Diff line
@@ -785,18 +785,6 @@ int cam_hw_cdm_init(void *hw_priv, 
	time_left = wait_for_completion_timeout(&cdm_core->reset_complete,

		msecs_to_jiffies(CAM_CDM_HW_RESET_TIMEOUT));



	/*

	 * Check for HW error and recover as a workaround

	 * Sometimes CDM HW triggers irq with invalid status for

	 * HW reset command, so ignore reset failure and proceed further

	 * as a workaround.

	 */

	if (time_left <= 0) {

		CAM_ERR(CAM_CDM, "CDM HW reset Wait failed time_left=%ld",

			time_left);

		time_left = 1;

	}



	if (time_left <= 0) {

		CAM_ERR(CAM_CDM, "CDM HW reset Wait failed rc=%d", rc);

		goto disable_return;