Skip to content

Commit

Permalink
firmware: stratix10-svc: add missing gen_pool_destroy() in stratix10_…
Browse files Browse the repository at this point in the history
…svc_drv_probe()

[ Upstream commit 9175ee1 ]

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: 7ca5ce8 ("firmware: add Intel Stratix10 service layer driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Link: https://lore.kernel.org/r/20221129163602.462369-1-dinguyen@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Yang Yingliang authored and mcarlin-ds committed Apr 18, 2023
1 parent 465993a commit 2ff71de
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions drivers/firmware/stratix10-svc.c
Original file line number Diff line number Diff line change
Expand Up @@ -994,13 +994,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;
Expand All @@ -1015,7 +1019,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);

Expand Down Expand Up @@ -1060,6 +1064,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
platform_device_put(svc->stratix10_svc_rsu);
err_free_kfifo:
kfifo_free(&controller->svc_fifo);
err_destroy_pool:
gen_pool_destroy(genpool);
return ret;
}

Expand Down

0 comments on commit 2ff71de

Please sign in to comment.