ASoC: mediatek: Check for error clk pointer
[ Upstream commit9de2b9286a
] Yes, you are right and now the return code depending on the init_clks(). Fixes:6078c65194
("soc: mediatek: Refine scpsys to support multiple platform") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> Link: https://lore.kernel.org/r/20211222015157.1025853-1-jiasheng@iscas.ac.cn Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
799b2c6cd7
Коммит
38accfd85e
|
@ -411,12 +411,17 @@ out:
|
|||
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,
|
||||
|
@ -426,7 +431,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];
|
||||
|
||||
|
@ -481,7 +486,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];
|
||||
|
|
Загрузка…
Ссылка в новой задаче