From bc4d188b69b6381a1860427885550ec3cc4ed166 Mon Sep 17 00:00:00 2001 From: Kassey Li Date: Wed, 26 Nov 2014 04:08:57 +0800 Subject: [PATCH] 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 Reviewed-on: http://git-master/r/655521 Reviewed-by: Bryan Wu GVS: Gerrit_Virtual_Submit Tested-by: Bryan Wu Reviewed-by: Frank Chen Reviewed-by: Matthew Pedro --- drivers/media/platform/soc_camera/tegra_camera/vi2.c | 7 ++++--- 1 file 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 c040cfae2a2..7c2aa368860 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; } -- 2.39.2