diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 12:47:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 12:47:02 -0800 |
| commit | 9e6a39eae450b81c8b2c8cbbfbdf8218e9b40c81 (patch) | |
| tree | 10ffa40e98f59518302b94f1f35d0b6596cc7f3e /drivers | |
| parent | 4de010e2c989a90e28272a92ca66e4bff4e79e0d (diff) | |
| parent | bdac39a3bd28891fb0ded91c9152459c57773462 (diff) | |
Merge tag 'devicetree-fixes-for-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- fix Flexcan binding schema errors introduced in rc3
- fix an of_node ref counting error in of_dma_is_coherent
* tag 'devicetree-fixes-for-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: clock: imx5: fix example
dt-bindings: can: fsl,flexcan.yaml: fix compatible for i.MX35 and i.MX53
dt-bindings: can: fsl,flexcan.yaml: fix fsl,stop-mode
of/address: Fix of_node memory leak in of_dma_is_coherent
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/address.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index eb9ab4f1e80b..1c3257a2d4e3 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -1034,11 +1034,13 @@ out: */ bool of_dma_is_coherent(struct device_node *np) { - struct device_node *node = of_node_get(np); + struct device_node *node; if (IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT)) return true; + node = of_node_get(np); + while (node) { if (of_property_read_bool(node, "dma-coherent")) { of_node_put(node); |