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

Commit 8b894d50 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

ASoC: mediatek: Check for error clk pointer 



[ Upstream commit 9de2b9286a6dd16966959b3cb34fc2ddfd39213e ]

Yes, you are right and now the return code depending on the
init_clks().

Fixes: 6078c651 ("soc: mediatek: Refine scpsys to support multiple platform")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20211222015157.1025853-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 41d2dc91

drivers/soc/mediatek/mtk-scpsys.c

+11 −4
Original line number Diff line number Diff line
@@ -333,12 +333,17 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) 
	return ret;

}



static void init_clks(struct platform_device *pdev, struct clk **clk)

static int init_clks(struct platform_device *pdev, struct clk **clk)

{

	int i;



	for (i = CLK_NONE + 1; i < CLK_MAX; i++)

	for (i = CLK_NONE + 1; i < CLK_MAX; i++) {

		clk[i] = devm_clk_get(&pdev->dev, clk_names[i]);

		if (IS_ERR(clk[i]))

			return PTR_ERR(clk[i]);

	}



	return 0;

}



static struct scp *init_scp(struct platform_device *pdev,
@@ -348,7 +353,7 @@ static struct scp *init_scp(struct platform_device *pdev, 
{

	struct genpd_onecell_data *pd_data;

	struct resource *res;

	int i, j;

	int i, j, ret;

	struct scp *scp;

	struct clk *clk[CLK_MAX];
@@ -403,7 +408,9 @@ static struct scp *init_scp(struct platform_device *pdev, 


	pd_data->num_domains = num;



	init_clks(pdev, clk);

	ret = init_clks(pdev, clk);

	if (ret)

		return ERR_PTR(ret);



	for (i = 0; i < num; i++) {

		struct scp_domain *scpd = &scp->domains[i];