6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter dan.carpenter@linaro.org
[ Upstream commit 87736ae12e1427bb2e6fd11f37b2ff76ed69aa0f ]
Add a missing call to of_node_put(np) on error.
There was a second error path where "np" was NULL, but that situation is impossible. The for_each_compatible_node() loop iterator is always non-NULL. Just deleted that error path.
Fixes: 54b406e10f03 ("cdx: Remove cdx controller list from cdx bus system") Signed-off-by: Dan Carpenter dan.carpenter@linaro.org Acked-by: Abhijit Gangurde abhijit.gangurde@amd.com Link: https://lore.kernel.org/r/2e66efc4-a13a-4774-8c9d-763455fe4834@moroto.mounta... Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/cdx/cdx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index d84d153078d7..40035dd2e299 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -572,12 +572,11 @@ static ssize_t rescan_store(const struct bus_type *bus,
/* Rescan all the devices */ for_each_compatible_node(np, NULL, compat_node_name) { - if (!np) - return -EINVAL; - pd = of_find_device_by_node(np); - if (!pd) + if (!pd) { + of_node_put(np); return -EINVAL; + }
cdx = platform_get_drvdata(pd); if (cdx && cdx->controller_registered && cdx->ops->scan)