diff options
| author | Ingo Molnar | 2019-02-28 08:27:17 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2019-02-28 08:27:17 +0100 |
| commit | 9ed8f1a6e7670aadd5aef30456a90b456ed1b185 (patch) | |
| tree | b93479f7f70187b68d29b747ce02c720ddb11f42 /arch/arm/mm | |
| parent | Merge tag 'perf-core-for-mingo-5.1-20190214' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | afs: Fix manually set volume location server list (diff) | |
| download | kernel-qcow2-linux-9ed8f1a6e7670aadd5aef30456a90b456ed1b185.tar.gz kernel-qcow2-linux-9ed8f1a6e7670aadd5aef30456a90b456ed1b185.tar.xz kernel-qcow2-linux-9ed8f1a6e7670aadd5aef30456a90b456ed1b185.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index f1e2922e447c..1e3e08a1c456 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -2390,4 +2390,6 @@ void arch_teardown_dma_ops(struct device *dev) return; arm_teardown_iommu_dma_ops(dev); + /* Let arch_setup_dma_ops() start again from scratch upon re-probe */ + set_dma_ops(dev, NULL); } |