| commit | 5cd964988bb64e870de46b26f3d0d0ff16d78ca3 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Feb 25 00:18:29 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Feb 25 00:18:28 2013 -0800 |
| tree | 07b007ed8df0be69cb6f04fc34831103560c8211 | |
| parent | d9c0d2f42a2da867800976c533f26a1d5fedbfb0 [diff] | |
| parent | 2c2de0f2a1d7b0f8d0c1e3d0b5035e18db4dde51 [diff] |
Merge "msm: camera: Fix stream on error"
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 eaec1e1..fa0bf18 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 @@ if (rc == 0) { pr_err("%s: wait timeout\n", __func__); rc = -1; + } else { + rc = 0; } } return rc;