aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds2024-07-25 10:10:34 -0700
committerLinus Torvalds2024-07-25 10:10:34 -0700
commit9cf601e865198c72e2a53118eaf37dcfd9a6cf1f (patch)
tree6debf6afd39519dd39ef9a977af8005e2605ce69 /kernel
parentc33ffdb70cc6df4105160f991288e7d2567d7ffa (diff)
parent28e8b7406d3a1f5329a03aa25a43aa28e087cb20 (diff)
Merge tag 'dma-mapping-6.11-2024-07-24' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fix from Christoph Hellwig: - fix the order of actions in dmam_free_coherent (Lance Richardson) * tag 'dma-mapping-6.11-2024-07-24' of git://git.infradead.org/users/hch/dma-mapping: dma: fix call order in dmam_free_coherent
Diffstat (limited to 'kernel')
-rw-r--r--kernel/dma/mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 81de84318ccc..b1c18058d55f 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -67,8 +67,8 @@ void dmam_free_coherent(struct device *dev, size_t size, void *vaddr,
{
struct dma_devres match_data = { size, vaddr, dma_handle };
- dma_free_coherent(dev, size, vaddr, dma_handle);
WARN_ON(devres_destroy(dev, dmam_release, dmam_match, &match_data));
+ dma_free_coherent(dev, size, vaddr, dma_handle);
}
EXPORT_SYMBOL(dmam_free_coherent);