Commit 214b09db authored by Johan Hovold's avatar Johan Hovold Committed by Dmitry Baryshkov
Browse files

drm/msm: fix drm device leak on bind errors 



Make sure to free the DRM device also in case of early errors during
bind().

Fixes: 2027e5b3 ("drm/msm: Initialize MDSS irq domain at probe time")
Cc: stable@vger.kernel.org      # 5.17
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/525097/
Link: https://lore.kernel.org/r/20230306100722.28485-6-johan+linaro@kernel.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent cd459c00

drivers/gpu/drm/msm/msm_drv.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -445,12 +445,12 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 




	ret = msm_init_vram(ddev);

	ret = msm_init_vram(ddev);

	if (ret)

	if (ret)

		return ret;

		goto err_put_dev;





	/* Bind all our sub-components: */

	/* Bind all our sub-components: */

	ret = component_bind_all(dev, ddev);

	ret = component_bind_all(dev, ddev);

	if (ret)

	if (ret)

		return ret;

		goto err_put_dev;





	dma_set_max_seg_size(dev, UINT_MAX);

	dma_set_max_seg_size(dev, UINT_MAX);
@@ -545,6 +545,12 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 




err_msm_uninit:

err_msm_uninit:

	msm_drm_uninit(dev);

	msm_drm_uninit(dev);



	return ret;



err_put_dev:

	drm_dev_put(ddev);



	return ret;

	return ret;

}

}