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

Commit 4161b68c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cpp: Update iommu handling"

parents e854bbf9 c6bd5f88

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+2 −1
Original line number Diff line number Diff line
@@ -2662,7 +2662,8 @@ STREAM_BUFF_END: 
		break;

	}

	case VIDIOC_MSM_CPP_IOMMU_DETACH: {

		if (cpp_dev->iommu_state == CPP_IOMMU_STATE_ATTACHED) {

		if ((cpp_dev->iommu_state == CPP_IOMMU_STATE_ATTACHED) &&

			(cpp_dev->stream_cnt == 0)) {

			iommu_detach_device(cpp_dev->domain,

				cpp_dev->iommu_ctx);

			cpp_dev->iommu_state = CPP_IOMMU_STATE_DETACHED;