commit | f94989aa3e1bbdcc283aac3fe45ec49998745d73 | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Tue Jul 31 07:05:46 2018 -0700 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Jul 31 07:05:46 2018 -0700 |
tree | d1305b4921d59d78d7a80596d9cb4431f61a6815 | |
parent | 34c5814e82438db5141c6d221c9e5034b5304fc4 [diff] | |
parent | 3281dc68cb8b7d9fd00b869ce81746131ea02538 [diff] |
Merge "arm: mm: dma-mapping: Use iommu_attach_group"
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index e346cf3..a8f8d46 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c
@@ -2483,7 +2483,10 @@ static int __arm_iommu_attach_device(struct device *dev, { int err; - err = iommu_attach_device(mapping->domain, dev); + if (!dev->iommu_group) + return -EINVAL; + + err = iommu_attach_group(mapping->domain, dev->iommu_group); if (err) return err;