diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-23 14:17:10 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-23 14:17:10 -0400 |
commit | eed097bd087135fe57471f8815ed1a569bc8260e (patch) | |
tree | 938aca555a69ef3b2099cd7ccc94dec2c1704a3c | |
parent | a67061e2a90bd023e7ed6518fe3dfeb24fe295ea (diff) | |
parent | 46a5905e1cd4a9d9d238ec7beece49ce49e2ad85 (diff) |
Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus
-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, | |||
1527 | if (IS_ERR(sgtl5000->mclk)) { | 1527 | if (IS_ERR(sgtl5000->mclk)) { |
1528 | ret = PTR_ERR(sgtl5000->mclk); | 1528 | ret = PTR_ERR(sgtl5000->mclk); |
1529 | dev_err(&client->dev, "Failed to get mclock: %d\n", ret); | 1529 | dev_err(&client->dev, "Failed to get mclock: %d\n", ret); |
1530 | /* Defer the probe to see if the clk will be provided later */ | ||
1531 | if (ret == -ENOENT) | ||
1532 | return -EPROBE_DEFER; | ||
1530 | return ret; | 1533 | return ret; |
1531 | } | 1534 | } |
1532 | 1535 | ||