diff mbox series

fpga: stratix10-soc: Fix return value check in s10_ops_write_init()

Message ID 20221126071430.19540-1-zhengyongjun3@huawei.com (mailing list archive)
State New
Headers show
Series fpga: stratix10-soc: Fix return value check in s10_ops_write_init() | expand

Commit Message

Zheng Yongjun Nov. 26, 2022, 7:14 a.m. UTC
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>
---
 drivers/fpga/stratix10-soc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
2.17.1

Comments

Russ Weight Nov. 29, 2022, 1:26 a.m. UTC | #1
On 11/25/22 23:14, Zheng Yongjun wrote:
> 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")

Reviewed-by: Russ Weight <russell.h.weight@intel.com>
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
> ---
>  drivers/fpga/stratix10-soc.c | 4 ++--
>  1 file 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;
>  		}
>
> --
> 2.17.1
>
Xu Yilun Dec. 30, 2022, 2:34 a.m. UTC | #2
On 2022-11-28 at 17:26:23 -0800, Russ Weight wrote:
> 
> 
> On 11/25/22 23:14, Zheng Yongjun wrote:
> > 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")
> 
> Reviewed-by: Russ Weight <russell.h.weight@intel.com>
> > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>

Acked-by: Xu Yilun <yilun.xu@intel.com>

Applied to for-6.2 and Cc: stable@vger.kernel.org

> > ---
> >  drivers/fpga/stratix10-soc.c | 4 ++--
> >  1 file 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;
> >  		}
> >
> > --
> > 2.17.1
> >
>
diff mbox series

Patch

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;
 		}