diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 09:56:43 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 09:56:43 +0200 |
| commit | 301a36fa700f9add6e14f5a95c7573e01578343a (patch) | |
| tree | 6ff94ff3b08b838353b9127eb5f8055b3de6b25f /drivers/firmware/efi/efi.c | |
| parent | ARM: 8611/1: l2x0: add PMU support (diff) | |
| parent | ARM: sa1111: provide to_sa1111_device() macro (diff) | |
| download | linux-301a36fa700f9add6e14f5a95c7573e01578343a.tar.xz linux-301a36fa700f9add6e14f5a95c7573e01578343a.zip | |
Merge branches 'misc' and 'sa1111-base' into for-linus
Diffstat (limited to 'drivers/firmware/efi/efi.c')
| -rw-r--r-- | drivers/firmware/efi/efi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 5a2631af7410..7dd2e2d37231 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -657,9 +657,12 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname, } if (subnode) { - node = of_get_flat_dt_subnode_by_name(node, subnode); - if (node < 0) + int err = of_get_flat_dt_subnode_by_name(node, subnode); + + if (err < 0) return 0; + + node = err; } return __find_uefi_params(node, info, dt_params[i].params); |