diff options
| author | Wojciech Bieganski <wbieganski@antmicro.com> | 2015-01-30 12:57:32 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-02-09 15:26:39 +0100 |
| commit | 2e26dfce64a4d12b47c36bb49adbd30575bffe36 (patch) | |
| tree | a9d5a0c4094cda10e6052ce2f73e588d4b2355c6 /drivers | |
| parent | 1236ab1f51d114e2a91e5bed4294772671179cc3 (diff) | |
apalis_t30: fix work of MIPI-CSI2 cameras after merging 'l4t-r16-r2' branch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/tegra_v4l2_camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tegra_v4l2_camera.c b/drivers/media/video/tegra_v4l2_camera.c index 0d50a0847383..169e406c6bc6 100644 --- a/drivers/media/video/tegra_v4l2_camera.c +++ b/drivers/media/video/tegra_v4l2_camera.c @@ -971,7 +971,7 @@ static int tegra_camera_capture_start(struct tegra_camera_dev *pcdev, pcdev->syncpt_vi = nvhost_syncpt_incr_max_ext(pcdev->ndev, TEGRA_VI_SYNCPT_VI, 1); TC_VI_REG_WT(pcdev, TEGRA_VI_CAMERA_CONTROL, - pdata->continuous_capture? 0x00000001: 0x00000005); + 0x00000001); err = nvhost_syncpt_wait_timeout_ext(pcdev->ndev, TEGRA_VI_SYNCPT_VI, pcdev->syncpt_vi, @@ -1039,8 +1039,8 @@ static int tegra_camera_capture_stop(struct tegra_camera_dev *pcdev, int port) /* TC_VI_REG_WT(pcdev, TEGRA_VI_CAMERA_CONTROL, */ /* 0x00000005); */ - /* pcdev->syncpt_vi = nvhost_syncpt_incr_max_ext(pcdev->ndev, */ - /* TEGRA_VI_SYNCPT_VI, 1); */ + pcdev->syncpt_vi = nvhost_syncpt_incr_max_ext(pcdev->ndev, + TEGRA_VI_SYNCPT_VI, 1); if (tegra_camera_port_is_csi(port)) err = nvhost_syncpt_wait_timeout_ext(pcdev->ndev, TEGRA_VI_SYNCPT_VI, |