diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-09-20 07:24:14 -0400 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-09-20 07:24:14 -0400 |
| commit | 6e0a16673c60386361ea37bde4190dd31d7bcd3e (patch) | |
| tree | f666ef69f23bd120d60a08b959b29ef992037789 /arch/arm64/mm | |
| parent | 3be7988674ab33565700a37b210f502563d932e6 (diff) | |
| parent | 82db33dc5e49fb625262d81125625d07a0d6184e (diff) | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index c4284c432ae8..610d8e53011e 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c | |||
| @@ -827,7 +827,7 @@ static bool do_iommu_attach(struct device *dev, const struct iommu_ops *ops, | |||
| 827 | * then the IOMMU core will have already configured a group for this | 827 | * then the IOMMU core will have already configured a group for this |
| 828 | * device, and allocated the default domain for that group. | 828 | * device, and allocated the default domain for that group. |
| 829 | */ | 829 | */ |
| 830 | if (!domain || iommu_dma_init_domain(domain, dma_base, size)) { | 830 | if (!domain || iommu_dma_init_domain(domain, dma_base, size, dev)) { |
| 831 | pr_warn("Failed to set up IOMMU for device %s; retaining platform DMA ops\n", | 831 | pr_warn("Failed to set up IOMMU for device %s; retaining platform DMA ops\n", |
| 832 | dev_name(dev)); | 832 | dev_name(dev)); |
| 833 | return false; | 833 | return false; |