From cc4549c47ea62ffcdfae257e508f99ac9896d73f Mon Sep 17 00:00:00 2001 From: Kevin Chan Date: Sat, 23 Feb 2013 21:35:17 -0800 Subject: [PATCH] msm: camera: Fix stream on error When ISP stream is enabled or disable on the fly, the ioctl is blocked until there is a register update ack. If the ack does not come, the ioctl will timeout. The return value for sucessful case should be 0 instead of the jiffies remaining before timeout. Change-Id: Ie549b7a0b75160d3c96f336c8a6a072e35c1ab43 Signed-off-by: Kevin Chan --- drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c index eaec1e1fbed..fa0bf18fe58 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c @@ -881,6 +881,8 @@ int msm_isp_cfg_axi_stream(struct vfe_device *vfe_dev, void *arg) if (rc == 0) { pr_err("%s: wait timeout\n", __func__); rc = -1; + } else { + rc = 0; } } return rc;