| commit | eed097bd087135fe57471f8815ed1a569bc8260e | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Tue Jul 23 19:17:10 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Tue Jul 23 19:17:10 2013 +0100 |
| tree | 938aca555a69ef3b2099cd7ccc94dec2c1704a3c | |
| parent | a67061e2a90bd023e7ed6518fe3dfeb24fe295ea [diff] | |
| parent | 46a5905e1cd4a9d9d238ec7beece49ce49e2ad85 [diff] |
Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d659d3a..6c8a9e7 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c
@@ -1527,6 +1527,9 @@ 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; }