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

	CDM_CDBG("Waiting for CDM HW resetdone\n");

	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) {

		pr_err("CDM HW reset Wait failed time_left=%ld\n", time_left);

		time_left = 1;

	}

	if (time_left <= 0) {

		pr_err("CDM HW reset Wait failed rc=%d\n", rc);

		goto disable_return;