diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-02-14 17:55:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-02-14 17:55:39 +0100 |
| commit | 5948342a526f43ffbd02ebac64670e55475b7e09 (patch) | |
| tree | 7232f9fd177424661ed21e3a4300090eb60f6b27 /drivers/soc | |
| parent | ALSA: hda/realtek: Fix deadlock by COEF mutex (diff) | |
| parent | ASoC: wm_adsp: Correct control read size when parsing compressed buffer (diff) | |
| download | linux-5948342a526f43ffbd02ebac64670e55475b7e09.tar.xz linux-5948342a526f43ffbd02ebac64670e55475b7e09.zip | |
Merge tag 'asoc-fix-v5.17-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.18
More fixes that have arrived in the past few -rcs, plus a MAINTAINERS
update. The biggest update here is the fix for control change
notifications in ASoC generic controls found by mixer-test.
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/mediatek/mtk-scpsys.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index 670cc82d17dc..ca75b14931ec 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -411,17 +411,12 @@ out: return ret; } -static int init_clks(struct platform_device *pdev, struct clk **clk) +static void 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, @@ -431,7 +426,7 @@ static struct scp *init_scp(struct platform_device *pdev, { struct genpd_onecell_data *pd_data; struct resource *res; - int i, j, ret; + int i, j; struct scp *scp; struct clk *clk[CLK_MAX]; @@ -486,9 +481,7 @@ static struct scp *init_scp(struct platform_device *pdev, pd_data->num_domains = num; - ret = init_clks(pdev, clk); - if (ret) - return ERR_PTR(ret); + init_clks(pdev, clk); for (i = 0; i < num; i++) { struct scp_domain *scpd = &scp->domains[i]; |