]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
media: tegra_camera: correct the return value of vi2_capture_start
authorKassey Li <kasseyl@nvidia.com>
Tue, 25 Nov 2014 20:08:57 +0000 (04:08 +0800)
committerMatthew Pedro <mapedro@nvidia.com>
Fri, 19 Dec 2014 06:37:52 +0000 (22:37 -0800)
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>
drivers/media/platform/soc_camera/tegra_camera/vi2.c

index c040cfae2a23911e15d1254e7af6ca477083eea8..7c2aa36886095abef01a9ae566c4e1a004ff4aa4 100644 (file)
@@ -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;
 }