aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2018-01-17 10:48:54 -0500
committerMark Brown <broonie@kernel.org>2018-01-18 05:59:01 -0500
commit8af5748fa48698a433ba9a1766204bda283dffa8 (patch)
tree6736dcc2b380838481f49456efe20c37aea24e73
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
ASoC: sgtl5000: Do not print error on probe deferral
When the MCLK is not yet available when the codec is probed, probe deferral will happen and in this case we should not print an error message. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/sgtl5000.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index f2bb4feba3b6..633cdcfc933d 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1332,10 +1332,13 @@ static int sgtl5000_i2c_probe(struct i2c_client *client,
1332 sgtl5000->mclk = devm_clk_get(&client->dev, NULL); 1332 sgtl5000->mclk = devm_clk_get(&client->dev, NULL);
1333 if (IS_ERR(sgtl5000->mclk)) { 1333 if (IS_ERR(sgtl5000->mclk)) {
1334 ret = PTR_ERR(sgtl5000->mclk); 1334 ret = PTR_ERR(sgtl5000->mclk);
1335 dev_err(&client->dev, "Failed to get mclock: %d\n", ret);
1336 /* Defer the probe to see if the clk will be provided later */ 1335 /* Defer the probe to see if the clk will be provided later */
1337 if (ret == -ENOENT) 1336 if (ret == -ENOENT)
1338 ret = -EPROBE_DEFER; 1337 ret = -EPROBE_DEFER;
1338
1339 if (ret != -EPROBE_DEFER)
1340 dev_err(&client->dev, "Failed to get mclock: %d\n",
1341 ret);
1339 goto disable_regs; 1342 goto disable_regs;
1340 } 1343 }
1341 1344