Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus
This commit is contained in:
commit
eed097bd08
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue