linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] device property: Check fwnode->secondary when finding properties
@ 2021-11-13 20:41 Daniel Scally
  2021-11-16  7:41 ` [device property] 995fe757ec: BUG:kernel_NULL_pointer_dereference,address kernel test robot
  0 siblings, 1 reply; 8+ messages in thread
From: Daniel Scally @ 2021-11-13 20:41 UTC (permalink / raw)
  To: linux-kernel; +Cc: gregkh, rafael, Andy Shevchenko, Hans de Goede

fwnode_property_get_reference_args() searches for named properties
against a fwnode_handle, but these could instead be against the fwnode's
secondary. If the property isn't found against the primary, check the
secondary to see if it's there instead.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Daniel Scally <djrscally@gmail.com>
---
 drivers/base/property.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/base/property.c b/drivers/base/property.c
index f1f35b48ab8b..7bac12b32fcb 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -478,8 +478,16 @@ int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
 				       unsigned int nargs, unsigned int index,
 				       struct fwnode_reference_args *args)
 {
-	return fwnode_call_int_op(fwnode, get_reference_args, prop, nargs_prop,
-				  nargs, index, args);
+	int ret;
+
+	ret = fwnode_call_int_op(fwnode, get_reference_args, prop, nargs_prop,
+				 nargs, index, args);
+
+	if (ret < 0 && !IS_ERR_OR_NULL(fwnode->secondary))
+		ret = fwnode_call_int_op(fwnode->secondary, get_reference_args,
+					 prop, nargs_prop, nargs, index, args);
+
+	return ret;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_get_reference_args);
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-11-19 21:47 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-13 20:41 [PATCH] device property: Check fwnode->secondary when finding properties Daniel Scally
2021-11-16  7:41 ` [device property] 995fe757ec: BUG:kernel_NULL_pointer_dereference,address kernel test robot
2021-11-16 14:55   ` Hans de Goede
2021-11-16 16:59     ` Andy Shevchenko
2021-11-17  0:10       ` Daniel Scally
2021-11-17 11:54         ` Hans de Goede
2021-11-17 12:38           ` Andy Shevchenko
2021-11-19 21:47             ` Daniel Scally

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).