Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc3d953 authored by E V Ravi's avatar E V Ravi
Browse files

msm: ais: Do not attach iommu if its already attached 



cam_ife_hw_mgr_init tried to attach smmu handle already
attached by ais_ife_dev_probe resulting in destroying of
iommu_hndl.

Change-Id: Ifa7194a7cc425476bcf9e0d7a871925a854c180f
Signed-off-by: default avatarE V Ravi <evenka@codeaurora.org>
parent f0d0d92d

drivers/media/platform/msm/ais/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+4 −3
Original line number Diff line number Diff line
@@ -6337,9 +6337,10 @@ int cam_ife_hw_mgr_init(struct cam_hw_mgr_intf *hw_mgr_intf, int *iommu_hdl) 
		return -EINVAL;

	}



	if (cam_smmu_ops(g_ife_hw_mgr.mgr_common.img_iommu_hdl,

		CAM_SMMU_ATTACH)) {

		CAM_ERR(CAM_ISP, "Attach iommu handle failed.");

	rc = cam_smmu_ops(g_ife_hw_mgr.mgr_common.img_iommu_hdl,

		CAM_SMMU_ATTACH);

	if (rc && rc != -EALREADY) {

		CAM_ERR(CAM_ISP, "Attach iommu handle failed %d", rc);

		goto attach_fail;

	}