lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 007/321] ASoC: kirkwood: fix external clock probe defer
    Date
    From: Russell King <rmk+kernel@armlinux.org.uk>

    [ Upstream commit 4523817d51bc3b2ef38da768d004fda2c8bc41de ]

    When our call to get the external clock fails, we forget to clean up
    the enabled internal clock correctly. Enable the clock after we have
    obtained all our resources.

    Fixes: 84aac6c79bfd ("ASoC: kirkwood: fix loss of external clock at probe time")
    Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
    Link: https://lore.kernel.org/r/E1iNGyK-0004oF-6A@rmk-PC.armlinux.org.uk
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/kirkwood/kirkwood-i2s.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
    index 9a2777b72dcd0..b84a504168473 100644
    --- a/sound/soc/kirkwood/kirkwood-i2s.c
    +++ b/sound/soc/kirkwood/kirkwood-i2s.c
    @@ -563,10 +563,6 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
    return PTR_ERR(priv->clk);
    }

    - err = clk_prepare_enable(priv->clk);
    - if (err < 0)
    - return err;
    -
    priv->extclk = devm_clk_get(&pdev->dev, "extclk");
    if (IS_ERR(priv->extclk)) {
    if (PTR_ERR(priv->extclk) == -EPROBE_DEFER)
    @@ -582,6 +578,10 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
    }
    }

    + err = clk_prepare_enable(priv->clk);
    + if (err < 0)
    + return err;
    +
    /* Some sensible defaults - this reflects the powerup values */
    priv->ctl_play = KIRKWOOD_PLAYCTL_SIZE_24;
    priv->ctl_rec = KIRKWOOD_RECCTL_SIZE_24;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-04 00:08    [W:4.219 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site