diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-07-16 09:17:27 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-16 18:52:03 +0100 |
| commit | 46a5905e1cd4a9d9d238ec7beece49ce49e2ad85 (patch) | |
| tree | 8a239d6b22ae23341911ed821e352cad9b7a9846 /sound | |
| parent | 5c78dfe87ea04b501ee000a7f03b9432ac9d008c (diff) | |
| download | linux-46a5905e1cd4a9d9d238ec7beece49ce49e2ad85.tar.gz linux-46a5905e1cd4a9d9d238ec7beece49ce49e2ad85.tar.bz2 linux-46a5905e1cd4a9d9d238ec7beece49ce49e2ad85.zip | |
ASoC: sgtl5000: defer the probe if clock is not found
It's not always the case that clock is already available when sgtl5000
get probed at the first time, e.g. the clock is provided by CPU DAI
which may be probed after sgtl5000. So let's defer the probe when
devm_clk_get() call fails and give it chance to try later.
It fixes the regression on imx28 since commit 9e13f34 (ASoC: sgtl5000:
Let the codec acquire its clock).
[ 1.927637] sgtl5000 0-000a: Failed to get mclock: -2
[ 1.934280] sgtl5000: probe of 0-000a failed with error -2
[ 1.945906] mxs-sgtl5000 sound.13: ASoC: CODEC (null) not registered
[ 1.953787] mxs-sgtl5000 sound.13: snd_soc_register_card failed (-517)
[ 1.960865] platform sound.13: Driver mxs-sgtl5000 requests probe deferral
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d659d3adcfb3..6c8a9e7bee25 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1527,6 +1527,9 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, if (IS_ERR(sgtl5000->mclk)) { ret = PTR_ERR(sgtl5000->mclk); dev_err(&client->dev, "Failed to get mclock: %d\n", ret); + /* Defer the probe to see if the clk will be provided later */ + if (ret == -ENOENT) + return -EPROBE_DEFER; return ret; } |