diff options
| author | Christoph Hellwig | 2018-09-25 22:16:55 +0200 |
|---|---|---|
| committer | Christoph Hellwig | 2018-09-26 00:12:26 +0200 |
| commit | 1a0afc14b5da329765d6ecd4a79f546b9363ad8c (patch) | |
| tree | 760667df33be493811fe60f7e1eb1b6190ed962a /arch/arm64/mm/dma-mapping.c | |
| parent | dma-mapping: support non-coherent devices in dma_common_get_sgtable (diff) | |
| download | kernel-qcow2-linux-1a0afc14b5da329765d6ecd4a79f546b9363ad8c.tar.gz kernel-qcow2-linux-1a0afc14b5da329765d6ecd4a79f546b9363ad8c.tar.xz kernel-qcow2-linux-1a0afc14b5da329765d6ecd4a79f546b9363ad8c.zip | |
Revert "dma-mapping: clear dev->dma_ops in arch_teardown_dma_ops"
This reverts commit 46053c73685411915d3de50c5a0045beef32806b.
This change breaks architectures setting up dma_ops in their own magic
way and not using arch_setup_dma_ops, so revert it.
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/arm64/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index cdcb73db9ea2..072c51fb07d7 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -862,6 +862,11 @@ out_err: dev_name(dev)); } +void arch_teardown_dma_ops(struct device *dev) +{ + dev->dma_ops = NULL; +} + #else static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, |