diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-02-11 08:01:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-02-11 08:01:50 +0100 |
| commit | c9ba7560c550fe6c1f4a8f0666bea41d2a349d1d (patch) | |
| tree | b15d53e69f73b160b4625e91187cd436c5a3e683 /drivers/fpga | |
| parent | sched/fair: Fix insertion in rq->leaf_cfs_rq_list (diff) | |
| parent | Linux 5.0-rc6 (diff) | |
| download | wireguard-linux-c9ba7560c550fe6c1f4a8f0666bea41d2a349d1d.tar.xz wireguard-linux-c9ba7560c550fe6c1f4a8f0666bea41d2a349d1d.zip | |
Merge tag 'v5.0-rc6' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/fpga')
| -rw-r--r-- | drivers/fpga/stratix10-soc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c index a1a09e04fab8..13851b3d1c56 100644 --- a/drivers/fpga/stratix10-soc.c +++ b/drivers/fpga/stratix10-soc.c @@ -508,14 +508,11 @@ static int __init s10_init(void) return -ENODEV; np = of_find_matching_node(fw_np, s10_of_match); - if (!np) { - of_node_put(fw_np); + if (!np) return -ENODEV; - } of_node_put(np); ret = of_platform_populate(fw_np, s10_of_match, NULL, NULL); - of_node_put(fw_np); if (ret) return ret; |