commit 774ebf349f07a0d97be21f668c306011c26693e1
author Lucas Wei <lucaswei@google.com> Mon May 31 17:41:44 2021 +0800
committer Lucas Wei <lucaswei@google.com> Wed Jun 02 08:23:14 2021 +0000
tree 7d687de188a4e693a41d74068d4024dc865eb13d
parent 025107aadc58c042d6db97d00ee9c7e3d1e4b679
parent 60b94308066188813f27f7c0d20ea8442793ef03

Merge 'android-msm-pixel-4.19' into android-msm-barbet-4.19

Bug: 187909050
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Ife28b0b6643ddfbdb4e354e3765a2dbcc864dc67

drivers/cam_sensor_module/cam_fw_update/PhoneUpdate.c

diff --git a/drivers/cam_sensor_module/cam_fw_update/PhoneUpdate.c b/drivers/cam_sensor_module/cam_fw_update/PhoneUpdate.c
index ee9e681..5ce8ec4 100644
--- a/drivers/cam_sensor_module/cam_fw_update/PhoneUpdate.c
+++ b/drivers/cam_sensor_module/cam_fw_update/PhoneUpdate.c
@@ -785,9 +785,8 @@
 		return( ans );

 	}

 

-	UlMAT0[ 10 ] = (UINT_32)((UINT_32)(pTbl->StAccel.SlOffsetX & 0xFFFF0000) | (UINT_32)(pTbl->StAngle.SlOffsetX) >> 16);

-	UlMAT0[ 11 ] = (UINT_32)((UINT_32)(pTbl->StAccel.SlOffsetY & 0xFFFF0000) | (UINT_32)(pTbl->StAngle.SlOffsetY) >> 16);

-	UlMAT0[ 12 ] = (UINT_32)((UINT_32)(pTbl->StAccel.SlOffsetZ & 0xFFFF0000) | (UINT_32)(pTbl->StAngle.SlOffsetZ) >> 16);

+	UlMAT0[ 10 ] = (UINT_32)((UINT_32)(UlMAT0[ 10 ] & 0xFFFF0000) | (UINT_32)(pTbl->StAngle.SlOffsetX) >> 16);

+	UlMAT0[ 11 ] = (UINT_32)((UINT_32)(UlMAT0[ 11 ] & 0xFFFF0000) | (UINT_32)(pTbl->StAngle.SlOffsetY) >> 16);

 

 	UsCkVal = MkInfMATsum( UlMAT0 ) ;

 	UlMAT0[ 63 ] &= (UINT_32)0xFFFF0000 ;

drivers/cam_sensor_module/cam_fw_update/fw_update.c

diff --git a/drivers/cam_sensor_module/cam_fw_update/fw_update.c b/drivers/cam_sensor_module/cam_fw_update/fw_update.c
index b0ddd89..6db8940 100644
--- a/drivers/cam_sensor_module/cam_fw_update/fw_update.c
+++ b/drivers/cam_sensor_module/cam_fw_update/fw_update.c
@@ -306,9 +306,7 @@
 		cal_result->SsDiffY, cal_result->SsDiffY);
 
 	if (abs(cal_result->SsRecalOffX) >= 0x600 ||
-		abs(cal_result->SsRecalOffY) >= 0x600 ||
-		abs(cal_result->SsDiffX) >= 0x1000 ||
-		abs(cal_result->SsDiffY) >= 0x1000) {
+		abs(cal_result->SsRecalOffY) >= 0x600) {
 		CAM_ERR(CAM_SENSOR,
 			"[OISCali] Check failed.");
 		return -EINVAL;