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

Commit 3533d562 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cpp: Changing order of setting GDSRC register"

parents 37fc04fb 2020ec69

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+3 −4
Original line number Diff line number Diff line
@@ -1328,6 +1328,9 @@ static int32_t cpp_load_fw(struct cpp_device *cpp_dev, char *fw_name_bin) 
		ptr_bin++;

	}

	msm_camera_io_w_mb(0x00, cpp_dev->cpp_hw_base + 0xC);

	rc = msm_cpp_update_gdscr_status(cpp_dev, true);

	if (rc < 0)

		pr_err("update cpp gdscr status failed\n");

	rc = msm_cpp_poll(cpp_dev->base, MSM_CPP_MSG_ID_OK);

	if (rc) {

		pr_err("%s:%d] poll command %x failed %d", __func__, __LINE__,
@@ -1373,10 +1376,6 @@ static int32_t cpp_load_fw(struct cpp_device *cpp_dev, char *fw_name_bin) 
			MSM_CPP_MSG_ID_JUMP_ACK, rc);

	}



	rc = msm_cpp_update_gdscr_status(cpp_dev, true);

	if (rc < 0)

		pr_err("update cpp gdscr status failed\n");



end:

	return rc;

}