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

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

Merge "iommu: msm: Add call to set client name during attach_dev"

parents b78bd5fd baf68ee2

drivers/iommu/msm_iommu-v1.c

+3 −0
Original line number Diff line number Diff line
@@ -1033,6 +1033,9 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) 
		goto unlock;

	}



	if (!(priv->client_name))

		priv->client_name = dev_name(dev);



	iommu_drvdata = dev_get_drvdata(dev->parent);

	ctx_drvdata = dev_get_drvdata(dev);

	if (!iommu_drvdata || !ctx_drvdata) {

drivers/iommu/msm_iommu_sec.c

+3 −0
Original line number Diff line number Diff line
@@ -745,6 +745,9 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) 
		goto fail;

	}



	if (!(priv->client_name))

		priv->client_name = dev_name(dev);



	iommu_drvdata = dev_get_drvdata(dev->parent);

	ctx_drvdata = dev_get_drvdata(dev);

	if (!iommu_drvdata || !ctx_drvdata) {