summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-23 22:17:10 +0400
committerMark Brown <broonie@linaro.org>2013-07-23 22:17:10 +0400
commiteed097bd087135fe57471f8815ed1a569bc8260e (patch)
tree938aca555a69ef3b2099cd7ccc94dec2c1704a3c /sound
parenta67061e2a90bd023e7ed6518fe3dfeb24fe295ea (diff)
parent46a5905e1cd4a9d9d238ec7beece49ce49e2ad85 (diff)
downloadlinux-eed097bd087135fe57471f8815ed1a569bc8260e.tar.xz
Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/sgtl5000.c3
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;
}