Merge "msm: camera: Fix DMI 64 bit write"
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
index bbdfaa6..2e9bcd7 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
@@ -239,13 +239,15 @@
msm_camera_io_w(lo_val1, vfe_dev->vfe_base +
vfe_dev->hw_info->dmi_reg_offset + 0x4);
} else if (reg_cfg_cmd->cmd_type ==
- VFE_WRITE_DMI_64BIT) {
- hi_val = *hi_tbl_ptr++;
+ VFE_WRITE_DMI_64BIT) {
+ lo_tbl_ptr++;
+ hi_val = *hi_tbl_ptr;
+ hi_tbl_ptr = hi_tbl_ptr + 2;
msm_camera_io_w(hi_val, vfe_dev->vfe_base +
- vfe_dev->hw_info->dmi_reg_offset);
+ vfe_dev->hw_info->dmi_reg_offset);
}
msm_camera_io_w(lo_val, vfe_dev->vfe_base +
- vfe_dev->hw_info->dmi_reg_offset + 0x4);
+ vfe_dev->hw_info->dmi_reg_offset + 0x4);
}
break;
}