Skip to content

Commit e0e01de

Browse files
remoteproc: imx_dsp_rproc: Call of_node_put() on iteration error
Function of_phandle_iterator_next() calls of_node_put() on the last device_node it iterated over, but when the loop exits prematurely it has to be called explicitly. Fixes: ec0e554 ("remoteproc: imx_dsp_rproc: Add remoteproc driver for DSP on i.MX") Cc: stable@vger.kernel.org Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> Link: https://lore.kernel.org/r/20230320221826.2728078-6-mathieu.poirier@linaro.org Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
1 parent 5ef074e commit e0e01de

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

drivers/remoteproc/imx_dsp_rproc.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -650,15 +650,19 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)
650650

651651
rmem = of_reserved_mem_lookup(it.node);
652652
if (!rmem) {
653+
of_node_put(it.node);
653654
dev_err(dev, "unable to acquire memory-region\n");
654655
return -EINVAL;
655656
}
656657

657-
if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da))
658+
if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) {
659+
of_node_put(it.node);
658660
return -EINVAL;
661+
}
659662

660663
cpu_addr = devm_ioremap_wc(dev, rmem->base, rmem->size);
661664
if (!cpu_addr) {
665+
of_node_put(it.node);
662666
dev_err(dev, "failed to map memory %p\n", &rmem->base);
663667
return -ENOMEM;
664668
}
@@ -667,10 +671,12 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)
667671
mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)rmem->base,
668672
rmem->size, da, NULL, NULL, it.node->name);
669673

670-
if (mem)
674+
if (mem) {
671675
rproc_coredump_add_segment(rproc, da, rmem->size);
672-
else
676+
} else {
677+
of_node_put(it.node);
673678
return -ENOMEM;
679+
}
674680

675681
rproc_add_carveout(rproc, mem);
676682
}

0 commit comments

Comments
 (0)