diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-20 15:38:49 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-20 15:38:48 -0800 |
| commit | ce488494ce823d2f5bff75c91726a95543bc7c29 (patch) | |
| tree | 6f7979b962febf46062dbffa7545f07ee09ce896 | |
| parent | 31eebba21f285535b5dc16f0394d7073232a4a54 (diff) | |
| parent | 61c2f04f34febf5c0a6935981ac03df78e6f63f8 (diff) | |
Merge "msm: camera: isp: don't set stripe_rd reload bit during hw reset"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/isp/msm_isp47.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c index 70950a88fc66..812027f3e539 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c @@ -788,7 +788,7 @@ long msm_vfe47_reset_hardware(struct vfe_device *vfe_dev, msm_camera_io_w(0xFFFFFEFF, vfe_dev->vfe_base + 0x68); msm_camera_io_w(0x1, vfe_dev->vfe_base + 0x58); vfe_dev->hw_info->vfe_ops.axi_ops. - reload_wm(vfe_dev, vfe_dev->vfe_base, 0x0031FFFF); + reload_wm(vfe_dev, vfe_dev->vfe_base, 0x0011FFFF); } if (blocking_call) { |