Commit 4295d785 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'iommu/nvidia/tegra' into iommu/next 

* iommu/nvidia/tegra:
  iommu/tegra-smmu: Pass correct fwnode to iommu_fwspec_init()
parents 906fe8b8 eac93f4d

drivers/iommu/tegra-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ static int tegra_smmu_configure(struct tegra_smmu *smmu, struct device *dev, 
	const struct iommu_ops *ops = smmu->iommu.ops;

	int err;



	err = iommu_fwspec_init(dev, &dev->of_node->fwnode, ops);

	err = iommu_fwspec_init(dev, &smmu->dev->of_node->fwnode, ops);

	if (err < 0) {

		dev_err(dev, "failed to initialize fwspec: %d\n", err);

		return err;