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

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

Merge "msm: isp: Avoid unaligned register access"

parents 90c94b92 2e31f9f3

drivers/media/platform/msm/camera_v2/isp/msm_isp_util_32.c

+4 −2
Original line number Diff line number Diff line
@@ -918,7 +918,8 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev, 
			(UINT_MAX - reg_cfg_cmd->u.rw_info.len)) ||

			((reg_cfg_cmd->u.rw_info.reg_offset +

			reg_cfg_cmd->u.rw_info.len) >

			resource_size(vfe_dev->vfe_mem))) {

			resource_size(vfe_dev->vfe_mem)) ||

			(reg_cfg_cmd->u.rw_info.reg_offset & 0x3)) {

			pr_err("%s:%d reg_offset %d len %d res %d\n",

				__func__, __LINE__,

				reg_cfg_cmd->u.rw_info.reg_offset,
@@ -1018,7 +1019,8 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev, 
			reg_cfg_cmd->u.mask_info.reg_offset) ||

			(resource_size(vfe_dev->vfe_mem) <

			reg_cfg_cmd->u.mask_info.reg_offset +

			sizeof(temp))) {

			sizeof(temp)) ||

			(reg_cfg_cmd->u.mask_info.reg_offset & 0x3)) {

			pr_err("%s: VFE_CFG_MASK: Invalid length\n", __func__);

			return -EINVAL;

		}