diff options
| author | Lucas Wei <lucaswei@google.com> | 2021-07-26 21:22:08 +0800 |
|---|---|---|
| committer | Lucas Wei <lucaswei@google.com> | 2021-07-26 21:22:08 +0800 |
| commit | e76c32c7e5bc57af24c87af8df40f148ba535732 (patch) | |
| tree | 7d687de188a4e693a41d74068d4024dc865eb13d | |
| parent | 60b94308066188813f27f7c0d20ea8442793ef03 (diff) | |
| parent | 774ebf349f07a0d97be21f668c306011c26693e1 (diff) | |
| download | camera-kernel-e76c32c7e5bc57af24c87af8df40f148ba535732.tar.gz | |
Merge 'android-msm-barbet-4.19' into android-msm-pixel-4.19android-t-preview-1_r0.3android-msm-redbull-4.19-t-preview-1
Bug: 194667419
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Id1cf2c3fd8eb71d841633d4ca7eb8ebe908d921f
| -rw-r--r-- | drivers/cam_sensor_module/cam_fw_update/PhoneUpdate.c | 5 | ||||
| -rw-r--r-- | drivers/cam_sensor_module/cam_fw_update/fw_update.c | 4 |
2 files changed, 3 insertions, 6 deletions
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 @@ UINT_8 WrGyroOffsetTbl( stGyroOffsetTbl *pTbl ) 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 ;
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 @@ int GyroReCalibrate(struct camera_io_master *io_master_info, 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; |