Merge "msm: isp: fix bug in cfg_camif"

This commit is contained in:
Linux Build Service Account 2017-04-03 06:24:36 -07:00 committed by Gerrit - the friendly Code Review server
commit 58889c53f5

View file

@ -1400,7 +1400,7 @@ void msm_vfe47_cfg_camif(struct vfe_device *vfe_dev,
if (subsample_period && subsample_pattern) { if (subsample_period && subsample_pattern) {
val = msm_camera_io_r(vfe_dev->vfe_base + 0x494); val = msm_camera_io_r(vfe_dev->vfe_base + 0x494);
val &= 0xFFFFE0FF; val &= 0xFFFFE0FF;
val = (subsample_period - 1) << 8; val |= (subsample_period - 1) << 8;
msm_camera_io_w(val, vfe_dev->vfe_base + 0x494); msm_camera_io_w(val, vfe_dev->vfe_base + 0x494);
ISP_DBG("%s:camif PERIOD %x PATTERN %x\n", ISP_DBG("%s:camif PERIOD %x PATTERN %x\n",
__func__, subsample_period, subsample_pattern); __func__, subsample_period, subsample_pattern);