| From fd70e40e05ceb721b324405f38d787ee2cfd69e4 Mon Sep 17 00:00:00 2001 |
| From: Russell King <rmk+kernel@armlinux.org.uk> |
| Date: Wed, 23 Oct 2019 14:46:44 +0100 |
| Subject: [PATCH] ASoC: kirkwood: fix external clock probe defer |
| |
| commit 4523817d51bc3b2ef38da768d004fda2c8bc41de upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c |
| index 3446a113f482..c323ae314b55 100644 |
| --- a/sound/soc/kirkwood/kirkwood-i2s.c |
| +++ b/sound/soc/kirkwood/kirkwood-i2s.c |
| @@ -559,10 +559,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) |
| @@ -578,6 +574,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.7.4 |
| |
