diff options
| author | Ingo Molnar | 2017-10-23 13:30:47 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2017-10-23 13:30:47 +0200 |
| commit | f95b23a112f1a31ea042483540cd907b58d23a5f (patch) | |
| tree | 3d41d2f8cf1d66ed593deb12f25a30d2905eb077 /drivers/of/property.c | |
| parent | x86/entry: Use SYSCALL_DEFINE() macros for sys_modify_ldt() (diff) | |
| parent | x86/unwind: Show function name+offset in ORC error messages (diff) | |
| download | kernel-qcow2-linux-f95b23a112f1a31ea042483540cd907b58d23a5f.tar.gz kernel-qcow2-linux-f95b23a112f1a31ea042483540cd907b58d23a5f.tar.xz kernel-qcow2-linux-f95b23a112f1a31ea042483540cd907b58d23a5f.zip | |
Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/of/property.c')
| -rw-r--r-- | drivers/of/property.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/property.c b/drivers/of/property.c index fbb72116e9d4..264c355ba1ff 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -954,7 +954,7 @@ of_fwnode_graph_get_port_parent(struct fwnode_handle *fwnode) struct device_node *np; /* Get the parent of the port */ - np = of_get_next_parent(to_of_node(fwnode)); + np = of_get_parent(to_of_node(fwnode)); if (!np) return NULL; |