diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-17 07:33:06 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-17 07:33:05 -0800 |
| commit | cbbefa3a421b5e136013a61fb7830da6f45666a1 (patch) | |
| tree | 9b7d9c771ecf31cdd38e5a4e209092f44a9919f0 | |
| parent | a384da95330ba4be38d42b13bd8811af0ddba087 (diff) | |
| parent | 78e048f819aaa3c044202416aff45a4716c5e7c6 (diff) | |
Merge "mm:camera: Do not detach isp node during smmu detach."
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c index de29692414d2..f7eb0f8ac5a8 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1179,26 +1179,6 @@ int msm_isp_smmu_attach(struct msm_isp_buf_mgr *buf_mgr, rc = msm_isp_buf_get_scratch(buf_mgr); if (rc) goto err2; - } else { - if (buf_mgr->attach_ref_cnt > 0) - buf_mgr->attach_ref_cnt--; - else - pr_err("%s: Error! Invalid ref_cnt %d\n", - __func__, buf_mgr->attach_ref_cnt); - - if (buf_mgr->attach_ref_cnt == 0) { - rc = msm_isp_buf_put_scratch(buf_mgr); - if (buf_mgr->secure_enable == SECURE_MODE) - rc |= cam_smmu_ops(buf_mgr->iommu_hdl, - CAM_SMMU_DETACH_SEC_VFE_NS_STATS); - else - rc |= cam_smmu_ops(buf_mgr->iommu_hdl, - CAM_SMMU_DETACH); - if (rc < 0) { - pr_err("%s: img/stats smmu detach error, rc :%d\n", - __func__, rc); - } - } } mutex_unlock(&buf_mgr->lock); |