summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZheng Yongjun <zhengyongjun3@huawei.com>2022-11-26 07:14:30 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-09 11:28:22 +0100
commitb10990bee73cba064def8f7e180e1888b02688e6 (patch)
tree9c3611bd63b4dd187aec437e27a71e545b483fcb
parent74cff472d3d66db13b5ef64f40dfa42383f71ff7 (diff)
downloadlinux-stable-b10990bee73cba064def8f7e180e1888b02688e6.tar.gz
linux-stable-b10990bee73cba064def8f7e180e1888b02688e6.tar.bz2
linux-stable-b10990bee73cba064def8f7e180e1888b02688e6.zip
fpga: stratix10-soc: Fix return value check in s10_ops_write_init()
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: e7eef1d7633a ("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>
-rw-r--r--drivers/fpga/stratix10-soc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index 357cea58ec98..f7f01982a512 100644
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -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;
}