Messages in this thread | | | Date | Mon, 7 Nov 2022 13:56:39 -0600 | Subject | Re: [PATCH 1/2] firmware: stratix10-svc: add missing gen_pool_destroy() in stratix10_svc_drv_probe() | From | Dinh Nguyen <> |
| |
On 11/3/22 02:09, Yang Yingliang wrote: > In error path in stratix10_svc_drv_probe(), gen_pool_destroy() should be called > to destroy the memory pool that created by svc_create_memory_pool(). > > Fixes: 7ca5ce896524 ("firmware: add Intel Stratix10 service layer driver") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > drivers/firmware/stratix10-svc.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c > index b4081f4d88a3..1a5640b3ab42 100644 > --- a/drivers/firmware/stratix10-svc.c > +++ b/drivers/firmware/stratix10-svc.c > @@ -1138,13 +1138,17 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev) > > /* allocate service controller and supporting channel */ > controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); > - if (!controller) > - return -ENOMEM; > + if (!controller) { > + ret = -ENOMEM; > + goto err_destroy_pool; > + } > > chans = devm_kmalloc_array(dev, SVC_NUM_CHANNEL, > sizeof(*chans), GFP_KERNEL | __GFP_ZERO); > - if (!chans) > - return -ENOMEM; > + if (!chans) { > + ret = -ENOMEM; > + goto err_destroy_pool; > + } > > controller->dev = dev; > controller->num_chans = SVC_NUM_CHANNEL; > @@ -1159,7 +1163,7 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev) > ret = kfifo_alloc(&controller->svc_fifo, fifo_size, GFP_KERNEL); > if (ret) { > dev_err(dev, "failed to allocate FIFO\n"); > - return ret; > + goto err_destroy_pool; > } > spin_lock_init(&controller->svc_fifo_lock); > > @@ -1221,6 +1225,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev) > > err_free_kfifo: > kfifo_free(&controller->svc_fifo); > +err_destroy_pool: > + gen_pool_destroy(genpool); > return ret; > } >
Acked-by: Dinh Nguyen <dinguyen@kernel.org>
| |