summaryrefslogtreecommitdiffstats
path: root/drivers/fpga
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-16 22:41:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-16 22:41:47 +0200
commitf685fc6ab05192c7bb924288c8685b95e92a7c65 (patch)
tree804b643604f19adefdcbd03065bb3e1bee515cf7 /drivers/fpga
parent7adb05bb813d1ba4863c8914eead6139d3d5f8ff (diff)
parent7876320f88802b22d4e2daf7eb027dd14175a0f8 (diff)
downloadlinux-f685fc6ab05192c7bb924288c8685b95e92a7c65.tar.bz2
Merge b4.19-rc4 into char-misc-next
We want the bugfixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga')
-rw-r--r--drivers/fpga/dfl-fme-pr.c2
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;
}