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

Commit 6d7f3842 authored by Gaosheng Cui's avatar Gaosheng Cui Committed by Greg Kroah-Hartman
Browse files

memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe() 



[ Upstream commit cb8fd6f75775165390ededea8799b60d93d9fe3e ]

The clk_disable_unprepare() should be called in the error handling
of devbus_get_timing_params() and of_platform_populate(), fix it by
replacing devm_clk_get and clk_prepare_enable by devm_clk_get_enabled.

Fixes: e81b6abe ("memory: add a driver for atmel ram controllers")
Signed-off-by: default avatarGaosheng Cui <cuigaosheng1@huawei.com>
Link: https://lore.kernel.org/r/20221126044911.7226-1-cuigaosheng1@huawei.com


Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8959188b

drivers/memory/mvebu-devbus.c

+1 −2
Original line number Diff line number Diff line
@@ -282,10 +282,9 @@ static int mvebu_devbus_probe(struct platform_device *pdev) 
	if (IS_ERR(devbus->base))

		return PTR_ERR(devbus->base);



	clk = devm_clk_get(&pdev->dev, NULL);

	clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(clk))

		return PTR_ERR(clk);

	clk_prepare_enable(clk);



	/*

	 * Obtain clock period in picoseconds,