diff options
author | Hiroshi Doyu <hdoyu@nvidia.com> | 2013-01-29 07:57:07 -0500 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-02-25 09:30:41 -0500 |
commit | d09e1333ec6c8c6fe2875dc2763ebbac84efe8d7 (patch) | |
tree | ebf88bc4f0ebf9b85a720abda93bb1b074e1554a /arch/arm/mm/dma-mapping.c | |
parent | 3e3a1823281fc342ac5d99d853167e009bb86258 (diff) |
ARM: dma-mapping: Set arm_dma_set_mask() for iommu->set_dma_mask()
struct dma_map_ops iommu_ops doesn't have ->set_dma_mask, which causes
crash when dma_set_mask() is called from some driver.
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
-rw-r--r-- | arch/arm/mm/dma-mapping.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index dda3904dc64c..d91c4880f559 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
@@ -1732,6 +1732,8 @@ struct dma_map_ops iommu_ops = { | |||
1732 | .unmap_sg = arm_iommu_unmap_sg, | 1732 | .unmap_sg = arm_iommu_unmap_sg, |
1733 | .sync_sg_for_cpu = arm_iommu_sync_sg_for_cpu, | 1733 | .sync_sg_for_cpu = arm_iommu_sync_sg_for_cpu, |
1734 | .sync_sg_for_device = arm_iommu_sync_sg_for_device, | 1734 | .sync_sg_for_device = arm_iommu_sync_sg_for_device, |
1735 | |||
1736 | .set_dma_mask = arm_dma_set_mask, | ||
1735 | }; | 1737 | }; |
1736 | 1738 | ||
1737 | struct dma_map_ops iommu_coherent_ops = { | 1739 | struct dma_map_ops iommu_coherent_ops = { |
@@ -1745,6 +1747,8 @@ struct dma_map_ops iommu_coherent_ops = { | |||
1745 | 1747 | ||
1746 | .map_sg = arm_coherent_iommu_map_sg, | 1748 | .map_sg = arm_coherent_iommu_map_sg, |
1747 | .unmap_sg = arm_coherent_iommu_unmap_sg, | 1749 | .unmap_sg = arm_coherent_iommu_unmap_sg, |
1750 | |||
1751 | .set_dma_mask = arm_dma_set_mask, | ||
1748 | }; | 1752 | }; |
1749 | 1753 | ||
1750 | /** | 1754 | /** |