| Message ID | 20211211145038.31612-1-linmq006@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] fpga: stratix10-soc: fix NULL vs IS_ERR() checking | expand |
On 12/11/21 6:50 AM, Miaoqian Lin wrote: > The stratix10_svc_allocate_memory function does not return NULL. It > returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value. > > Signed-off-by: Miaoqian Lin <linmq006@gmail.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 047fd7f23706..91212bab5871 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); Thanks! Reviewed-by: Tom Rix <trix@redhat.com> > goto init_done; > } >
On Sat, Dec 11, 2021 at 06:57:51AM -0800, Tom Rix wrote: > > On 12/11/21 6:50 AM, Miaoqian Lin wrote: > > The stratix10_svc_allocate_memory function does not return NULL. It > > returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value. > > > > Signed-off-by: Miaoqian Lin <linmq006@gmail.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 047fd7f23706..91212bab5871 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); > > Thanks! > > Reviewed-by: Tom Rix <trix@redhat.com> Acked-by: Xu Yilun <yilun.xu@intel.com> Thanks, Yilun > > > goto init_done; > > }
> > On 12/11/21 6:50 AM, Miaoqian Lin wrote: > > > The stratix10_svc_allocate_memory function does not return NULL. It > > > returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value. > > > Please add "Fixes" tag, then Acked-by: Wu Hao <hao.wu@intel.com> Thanks for the patch. Hao > > > Signed-off-by: Miaoqian Lin <linmq006@gmail.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 047fd7f23706..91212bab5871 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); > > > > Thanks! > > > > Reviewed-by: Tom Rix <trix@redhat.com> > > Acked-by: Xu Yilun <yilun.xu@intel.com> > > Thanks, > Yilun > > > > > > goto init_done; > > > }
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c index 047fd7f23706..91212bab5871 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; }
The stratix10_svc_allocate_memory function does not return NULL. It returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value. Signed-off-by: Miaoqian Lin <linmq006@gmail.com> --- drivers/fpga/stratix10-soc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)