software node: Fix node registration

Heikki Krogerus · gregkh · commit 1cb73c82622c · 2021-03-17T17:03:48.000+01:00
commit 8891123 upstream. Software node can not be registered before its parent. Fixes: 80488a6 ("software node: Add support for static node descriptors") Cc: 5.10+ <stable@vger.kernel.org> # 5.10+ Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Tested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
@@ -812,6 +812,9 @@ int software_node_register(const struct software_node *node)
 	if (software_node_to_swnode(node))
 		return -EEXIST;
 
+	if (node->parent && !parent)
+		return -EINVAL;
+
 	return PTR_ERR_OR_ZERO(swnode_register(node, parent, 0));
 }
 EXPORT_SYMBOL_GPL(software_node_register);

Original file line number	Diff line number	Diff line change
`@@ -812,6 +812,9 @@ int software_node_register(const struct software_node *node)`
`812`	`812`	`if (software_node_to_swnode(node))`
`813`	`813`	`return -EEXIST;`
`814`	`814`
	`815`	`+ if (node->parent && !parent)`
	`816`	`+ return -EINVAL;`
	`817`	`+`
`815`	`818`	`return PTR_ERR_OR_ZERO(swnode_register(node, parent, 0));`
`816`	`819`	`}`
`817`	`820`	`EXPORT_SYMBOL_GPL(software_node_register);`