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

Commit 3f55b80f authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

video: fbdev: pxa3xx-gcu: release the resources correctly in pxa3xx_gcu_probe/remove() 



[ Upstream commit d87ad457f7e1b8d2492ca5b1531eb35030a1cc8f ]

In pxa3xx_gcu_probe(), the sequence of error lable is wrong, it will
leads some resource leaked, so adjust the sequence to handle the error
correctly, and if pxa3xx_gcu_add_buffer() fails, pxa3xx_gcu_free_buffers()
need be called.
In pxa3xx_gcu_remove(), add missing clk_disable_unpreprare().

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6b3fc149

drivers/video/fbdev/pxa3xx-gcu.c

+7 −5
Original line number Diff line number Diff line
@@ -663,6 +663,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev) 
	for (i = 0; i < 8; i++) {

		ret = pxa3xx_gcu_add_buffer(dev, priv);

		if (ret) {

			pxa3xx_gcu_free_buffers(dev, priv);

			dev_err(dev, "failed to allocate DMA memory\n");

			goto err_disable_clk;

		}
@@ -678,15 +679,15 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev) 
			SHARED_SIZE, irq);

	return 0;



err_free_dma:

	dma_free_coherent(dev, SHARED_SIZE,

			priv->shared, priv->shared_phys);

err_disable_clk:

	clk_disable_unprepare(priv->clk);



err_misc_deregister:

	misc_deregister(&priv->misc_dev);



err_disable_clk:

	clk_disable_unprepare(priv->clk);

err_free_dma:

	dma_free_coherent(dev, SHARED_SIZE,

			  priv->shared, priv->shared_phys);



	return ret;

}
@@ -699,6 +700,7 @@ static int pxa3xx_gcu_remove(struct platform_device *pdev) 
	pxa3xx_gcu_wait_idle(priv);

	misc_deregister(&priv->misc_dev);

	dma_free_coherent(dev, SHARED_SIZE, priv->shared, priv->shared_phys);

	clk_disable_unprepare(priv->clk);

	pxa3xx_gcu_free_buffers(dev, priv);



	return 0;