summaryrefslogtreecommitdiff
path: root/drivers/media/platform/soc_camera/tegra_camera/vi2.c
diff options
context:
space:
mode:
authorKassey Li <kasseyl@nvidia.com>2014-11-26 04:08:57 +0800
committerMatthew Pedro <mapedro@nvidia.com>2014-12-18 22:37:52 -0800
commitbc4d188b69b6381a1860427885550ec3cc4ed166 (patch)
tree9879cbeeb8558e838e58718850cc6916e7af5b8a /drivers/media/platform/soc_camera/tegra_camera/vi2.c
parent02057759d8344e6753cf5ec38c9a117490505aae (diff)
media: tegra_camera: correct the return value of vi2_capture_start
return the status of nvhost_syncpt_wait_timeout_ext in vi2_capture_start. Bug 1583009 Change-Id: I2b2ecaf868d0a05e2fa46b23e7eb40ee76aea380 Signed-off-by: Kassey Li <kasseyl@nvidia.com> Reviewed-on: http://git-master/r/655521 Reviewed-by: Bryan Wu <pengw@nvidia.com> GVS: Gerrit_Virtual_Submit Tested-by: Bryan Wu <pengw@nvidia.com> Reviewed-by: Frank Chen <frankc@nvidia.com> Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Diffstat (limited to 'drivers/media/platform/soc_camera/tegra_camera/vi2.c')
-rw-r--r--drivers/media/platform/soc_camera/tegra_camera/vi2.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/platform/soc_camera/tegra_camera/vi2.c b/drivers/media/platform/soc_camera/tegra_camera/vi2.c
index c040cfae2a23..7c2aa3688609 100644
--- a/drivers/media/platform/soc_camera/tegra_camera/vi2.c
+++ b/drivers/media/platform/soc_camera/tegra_camera/vi2.c
@@ -798,9 +798,10 @@ static int vi2_capture_start(struct tegra_camera_dev *cam,
cam->sof = 0;
/* Capture syncpt timeout err, then dump error status */
- if (err)
- err = vi2_capture_error_status(cam);
-
+ if (err) {
+ dev_err(&cam->ndev->dev, "CSI sync point failure\n");
+ vi2_capture_error_status(cam);
+ }
return err;
}