Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus

git-mirror · Jul 23, 2013 · eed097b · eed097b
2 parents a67061e + 46a5905
commit eed097b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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;
 	}