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

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

Merge "msm: camera: fd: disable the flush slave pending trans polling" into dev/msm-4.9-camx

parents 803fc788 004a0552

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -402,9 +402,10 @@ static int cam_cpastop_poweroff(struct cam_hw_info *cpas_hw) 
			CAM_CPAS_POLL_RETRY_CNT,

			CAM_CPAS_POLL_MIN_USECS, CAM_CPAS_POLL_MAX_USECS);

		if (rc) {

			CAM_ERR(CAM_CPAS,

			CAM_DBG(CAM_CPAS,

				"camnoc flush slave pending trans failed");

			/* Do not return error, passthrough */

			rc = 0;

		}

	}

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cpastop_v170_110.h

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static uint32_t cam_cpas110_slave_error_logger[] = { 


static struct cam_cpas_hw_errata_wa_list cam170_cpas110_errata_wa_list = {

	.camnoc_flush_slave_pending_trans = {

		.enable = true,

		.enable = false,

		.data.reg_info = {

			.access_type = CAM_REG_TYPE_READ,

			.offset = 0x2100, /* SidebandManager_SenseIn0_Low */