From db7831a740b3df9626b314780d93fe83c4ea8f81 Mon Sep 17 00:00:00 2001 From: shangbl1 Date: Tue, 7 Apr 2020 15:16:14 +0800 Subject: [PATCH] update CCI tools kernel 4.9 cci_intf.h keep kernel and bionic the same, don't need cci_device Change-Id: I60295e8027953f8308e047d34ed1491b7f353e3c Signed-off-by: shangbl1 Reviewed-on: https://gerrit.mot.com/1529155 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- .../platform/msm/camera/cam_sensor_module/cam_cci/cci_intf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cci_intf.c b/drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cci_intf.c index b0de5aa683e7..dcda77c41688 100644 --- a/drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cci_intf.c +++ b/drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cci_intf.c @@ -46,7 +46,11 @@ static int32_t cci_intf_xfer( __func__, cmd, xfer->cci_bus, xfer->slave_addr, xfer->reg.width, xfer->reg.addr, xfer->data.count); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0) if (xfer->cci_device > 1 || xfer->cci_bus > 1 || xfer->slave_addr > 0x7F || +#else + if (xfer->cci_bus > 1 || xfer->slave_addr > 0x7F || +#endif xfer->reg.width < 1 || xfer->reg.width > 2 || xfer->reg.addr > ((1<<(8*xfer->reg.width))-1) || xfer->data.count < 1 ||