Merge "msm: ais: Do not attach iommu if its already attached" (28663b69) · Commits · e / devices / android_kernel_xiaomi_nabu

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;
		}