Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c18107b authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Neil Armstrong
Browse files

drm/meson: Fix some error handling paths in 'meson_drv_bind_master()' 



If one of these functions fail, we whould free 'drm', as alreadry done in
the other error handling paths, below and above.

Fixes: bbbe775e ("drm: Add support for Amlogic Meson Graphic Controller")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/df47e03d36c2cf7bc37ec3105fc47c16555bd946.1520885192.git.christophe.jaillet@wanadoo.fr
parent dcacf651

drivers/gpu/drm/meson/meson_drv.c

+16 −8
Original line number Diff line number Diff line
@@ -189,35 +189,43 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) 


	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vpu");

	regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(regs))

		return PTR_ERR(regs);

	if (IS_ERR(regs)) {

		ret = PTR_ERR(regs);

		goto free_drm;

	}



	priv->io_base = regs;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hhi");

	/* Simply ioremap since it may be a shared register zone */

	regs = devm_ioremap(dev, res->start, resource_size(res));

	if (!regs)

		return -EADDRNOTAVAIL;

	if (!regs) {

		ret = -EADDRNOTAVAIL;

		goto free_drm;

	}



	priv->hhi = devm_regmap_init_mmio(dev, regs,

					  &meson_regmap_config);

	if (IS_ERR(priv->hhi)) {

		dev_err(&pdev->dev, "Couldn't create the HHI regmap\n");

		return PTR_ERR(priv->hhi);

		ret = PTR_ERR(priv->hhi);

		goto free_drm;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmc");

	/* Simply ioremap since it may be a shared register zone */

	regs = devm_ioremap(dev, res->start, resource_size(res));

	if (!regs)

		return -EADDRNOTAVAIL;

	if (!regs) {

		ret = -EADDRNOTAVAIL;

		goto free_drm;

	}



	priv->dmc = devm_regmap_init_mmio(dev, regs,

					  &meson_regmap_config);

	if (IS_ERR(priv->dmc)) {

		dev_err(&pdev->dev, "Couldn't create the DMC regmap\n");

		return PTR_ERR(priv->dmc);

		ret = PTR_ERR(priv->dmc);

		goto free_drm;

	}



	priv->vsync_irq = platform_get_irq(pdev, 0);