lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 222/453] ASoC: jz4740-i2s: add missed checks for clk_get()
    Date
    From: Chuhong Yuan <hslester96@gmail.com>

    [ Upstream commit 1c1fb2653a0c2e3f310c07eacd8fc3a10e08c97a ]

    jz4740_i2s_set_sysclk() does not check the return values of clk_get(),
    while the file dereferences the pointers in clk_put().
    Add the missed checks to fix it.

    Fixes: 11bd3dd1b7c2 ("ASoC: Add JZ4740 ASoC support")
    Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
    Link: https://lore.kernel.org/r/20201203144227.418194-1-hslester96@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/jz4740/jz4740-i2s.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
    index 0bbd86390be59..9bfd2aabbfe63 100644
    --- a/sound/soc/jz4740/jz4740-i2s.c
    +++ b/sound/soc/jz4740/jz4740-i2s.c
    @@ -309,10 +309,14 @@ static int jz4740_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id,
    switch (clk_id) {
    case JZ4740_I2S_CLKSRC_EXT:
    parent = clk_get(NULL, "ext");
    + if (IS_ERR(parent))
    + return PTR_ERR(parent);
    clk_set_parent(i2s->clk_i2s, parent);
    break;
    case JZ4740_I2S_CLKSRC_PLL:
    parent = clk_get(NULL, "pll half");
    + if (IS_ERR(parent))
    + return PTR_ERR(parent);
    clk_set_parent(i2s->clk_i2s, parent);
    ret = clk_set_rate(i2s->clk_i2s, freq);
    break;
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:42    [W:2.124 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site