]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fpga: stratix10-soc: Fix return value check in s10_ops_write_init()
authorZheng Yongjun <zhengyongjun3@huawei.com>
Sat, 26 Nov 2022 07:14:30 +0000 (07:14 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Feb 2023 10:28:22 +0000 (11:28 +0100)
commit 65ea840afd508194b0ee903256162aa87e46ec30 upstream.

In case of error, the function stratix10_svc_allocate_memory()
returns ERR_PTR() and never returns NULL. The NULL test in the
return value check should be replaced with IS_ERR().

Fixes: 9e3c1f650ab6 ("fpga: add intel stratix10 soc fpga manager driver")
Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Reviewed-by: Russ Weight <russell.h.weight@intel.com>
Cc: stable@vger.kernel.org
Acked-by: Xu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20221126071430.19540-1-zhengyongjun3@huawei.com
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/fpga/stratix10-soc.c

index 357cea58ec98ef4d5dc428379675ff69d80b88bb..f7f01982a512662007c805153988417dcdb7fdd1 100644 (file)
@@ -213,9 +213,9 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
        /* Allocate buffers from the service layer's pool. */
        for (i = 0; i < NUM_SVC_BUFS; i++) {
                kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE);
-               if (!kbuf) {
+               if (IS_ERR(kbuf)) {
                        s10_free_buffers(mgr);
-                       ret = -ENOMEM;
+                       ret = PTR_ERR(kbuf);
                        goto init_done;
                }