Merge tag 'dma-mapping-6.11-2024-07-24' of git://git.infradead.org/users/hch/dma-mapping

torvalds · torvalds · commit 9cf601e86519 · 2024-07-25T10:10:34.000-07:00
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
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ void dmam_free_coherent(struct device dev, size_t size, void vaddr,`
`67`	`67`	`{`
`68`	`68`	`struct dma_devres match_data = { size, vaddr, dma_handle };`
`69`	`69`
`70`		`- dma_free_coherent(dev, size, vaddr, dma_handle);`
`71`	`70`	`WARN_ON(devres_destroy(dev, dmam_release, dmam_match, &match_data));`
	`71`	`+ dma_free_coherent(dev, size, vaddr, dma_handle);`
`72`	`72`	`}`
`73`	`73`	`EXPORT_SYMBOL(dmam_free_coherent);`
`74`	`74`