Add check for the return value of alloc_ordered_workqueue as it may return
NULL pointer.
Moreover, use the destroy_workqueue in the later fails in order to avoid
memory leak.

Signed-off-by: Jiasheng Jiang <jiash...@iscas.ac.cn>
---
Changelog:

v1 -> v2:

1. Convert "goto err_destroy_workqueue" into "goto err_msm_unit" and
remove "err_destroy_workqueue" label.
---
 drivers/gpu/drm/msm/msm_drv.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 8b0b0ac74a6f..54be323ed33d 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -418,6 +418,8 @@ static int msm_drm_init(struct device *dev, const struct 
drm_driver *drv)
        priv->dev = ddev;
 
        priv->wq = alloc_ordered_workqueue("msm", 0);
+       if (!priv->wq)
+               return -ENOMEM;
 
        INIT_LIST_HEAD(&priv->objects);
        mutex_init(&priv->obj_lock);
@@ -440,12 +442,12 @@ static int msm_drm_init(struct device *dev, const struct 
drm_driver *drv)
 
        ret = msm_init_vram(ddev);
        if (ret)
-               return ret;
+               goto err_msm_uninit;
 
        /* Bind all our sub-components: */
        ret = component_bind_all(dev, ddev);
        if (ret)
-               return ret;
+               goto err_msm_uninit;
 
        dma_set_max_seg_size(dev, UINT_MAX);
 
-- 
2.25.1

Reply via email to