diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 19bdada644351e0b3c55ece144d62576c2948453..10af340eedd230d6b3aeb6367d3d0432117c9bb3 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -1122,9 +1122,9 @@ acpi_graph_get_remote_endpoint(const struct fwnode_handle *__fwnode)
 	if (ret)
 		return NULL;
 
-	/* Ensure this is a device node. */
+	/* Direct endpoint reference? */
 	if (!is_acpi_device_node(args.fwnode))
-		return NULL;
+		return args.nargs ? NULL : args.fwnode;
 
 	/*
 	 * Always require two arguments with the reference: port and