浏览代码

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

Mark Brown 12 年之前
父节点
当前提交
eed097bd08
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      sound/soc/codecs/sgtl5000.c

+ 3 - 0
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;
 	}