diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-10-04 09:23:03 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-10-04 09:23:03 +0300 |
commit | c0554d2d3db438623b4f2f9abc3d766b2b15d2fb (patch) | |
tree | d00dc324772b95373f4bdc566b3437e5bf637157 /drivers/fpga/dfl-fme-pr.c | |
parent | bef459026b161fbc39d20dcba698ed0cfffbac38 (diff) | |
parent | 1d2ba7fee28b3a47cca8e8f4f94a22d30b2b3a6f (diff) | |
download | linux-c0554d2d3db438623b4f2f9abc3d766b2b15d2fb.tar.xz |
Merge branch 'linus' into x86/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/fpga/dfl-fme-pr.c')
-rw-r--r-- | drivers/fpga/dfl-fme-pr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fpga/dfl-fme-pr.c b/drivers/fpga/dfl-fme-pr.c index fc9fd2d0482f..0b840531ef33 100644 --- a/drivers/fpga/dfl-fme-pr.c +++ b/drivers/fpga/dfl-fme-pr.c @@ -420,7 +420,7 @@ static int pr_mgmt_init(struct platform_device *pdev, /* Create region for each port */ fme_region = dfl_fme_create_region(pdata, mgr, fme_br->br, i); - if (!fme_region) { + if (IS_ERR(fme_region)) { ret = PTR_ERR(fme_region); goto destroy_region; } |