projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e3a182
)
ARM: dma-mapping: Set arm_dma_set_mask() for iommu->set_dma_mask()
author
Hiroshi Doyu
<
[email protected]
>
Tue, 29 Jan 2013 12:57:07 +0000
(14:57 +0200)
committer
Marek Szyprowski
<
[email protected]
>
Mon, 25 Feb 2013 14:30:41 +0000
(15:30 +0100)
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 <
[email protected]
>
Signed-off-by: Marek Szyprowski <
[email protected]
>
arch/arm/mm/dma-mapping.c
patch
|
blob
|
history
diff --git
a/arch/arm/mm/dma-mapping.c
b/arch/arm/mm/dma-mapping.c
index dda3904dc64c1cb3f7681cf20998397c1e103f76..d91c4880f559d26aa878dd0c7ed798637d8ba4ec 100644
(file)
--- a/
arch/arm/mm/dma-mapping.c
+++ b/
arch/arm/mm/dma-mapping.c
@@
-1732,6
+1732,8
@@
struct dma_map_ops iommu_ops = {
.unmap_sg = arm_iommu_unmap_sg,
.sync_sg_for_cpu = arm_iommu_sync_sg_for_cpu,
.sync_sg_for_device = arm_iommu_sync_sg_for_device,
+
+ .set_dma_mask = arm_dma_set_mask,
};
struct dma_map_ops iommu_coherent_ops = {
@@
-1745,6
+1747,8
@@
struct dma_map_ops iommu_coherent_ops = {
.map_sg = arm_coherent_iommu_map_sg,
.unmap_sg = arm_coherent_iommu_unmap_sg,
+
+ .set_dma_mask = arm_dma_set_mask,
};
/**