firmware: stratix10-svc: add missing gen_pool_destroy() in stratix10_svc_drv_probe()
Dinh Nguyen
maintainerPATCH 1/2 firmware: stratix10-svc: add missing gen_pool_destroy() in stratix10_svc_drv_probe()
From: Yang Yingliang <[email protected]>
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 <[email protected]>
Signed-off-by Dinh Nguyen <[email protected]>
--- drivers/firmware/stratix10-svc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/firmware/stratix10-svc.c +11 -5
@@ -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; }
Signature · 1 line
2.25.1
Dinh Nguyen
maintainerPATCH 2/2 firmware: stratix10-svc: fix error handle while alloc/add device failed
From: Yang Yingliang <[email protected]>
If add device "stratix10-rsu" failed in stratix10_svc_drv_probe(), the 'svc_fifo' and 'genpool' need be freed in the error path.
If allocate or add device "intel-fcs" failed in stratix10_svc_drv_probe(), the device "stratix10-rsu" need be unregistered in the error path.
Fixes e6281c26674e ("firmware: stratix10-svc: Add support for FCS")
Signed-off-by Yang Yingliang <[email protected]>
Signed-off-by Dinh Nguyen <[email protected]>
--- drivers/firmware/stratix10-svc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/firmware/stratix10-svc.c +6 -3
@@ -1202,19 +1202,20 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev) ret =platform_device_add (svc->stratix10_svc_rsu);if (ret) {platform_device_put (svc->stratix10_svc_rsu); -return ret; + goto err_free_kfifo; } svc->intel_svc_fcs =platform_device_alloc (INTEL_FCS ,1 );if (!svc->intel_svc_fcs) {dev_err (dev,"failed to allocate %s device\n" ,INTEL_FCS ); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_unregister_dev; } ret =platform_device_add (svc->intel_svc_fcs);if (ret) {platform_device_put (svc->intel_svc_fcs); -return ret; + goto err_unregister_dev; }dev_set_drvdata (dev, svc);
@@ -1223,6 +1224,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)return 0 ; +err_unregister_dev: +platform_device_unregister (svc->stratix10_svc_rsu); err_free_kfifo:kfifo_free (&controller->svc_fifo); err_destroy_pool:
Signature · 1 line
2.25.1