From: Nicolin Chen <nicoleotsuka@gmail.com>
Date: Thu, 28 Jul 2016 22:43:01 +0000 (-0700)
Subject: ASoC: cs53l30: Do not ignore errors if mclk is specified
X-Git-Tag: v4.9-rc1~4^2~4^2~9^4
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=4d48298af85aff3dcc9498a564e06efeb9c935be;hp=-c;p=cascardo%2Flinux.git

ASoC: cs53l30: Do not ignore errors if mclk is specified

When the clock is specified, there could be other errors besides
the EPROBE_DEFER so don't ignore them.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

4d48298af85aff3dcc9498a564e06efeb9c935be
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index 2c0d9c430a8c..227c55643fa5 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -999,8 +999,8 @@ static int cs53l30_i2c_probe(struct i2c_client *client,
 	/* Check if MCLK provided */
 	cs53l30->mclk = devm_clk_get(dev, "mclk");
 	if (IS_ERR(cs53l30->mclk)) {
-		if (PTR_ERR(cs53l30->mclk) == -EPROBE_DEFER) {
-			ret = -EPROBE_DEFER;
+		if (PTR_ERR(cs53l30->mclk) != -ENOENT) {
+			ret = PTR_ERR(cs53l30->mclk);
 			goto error;
 		}
 		/* Otherwise mark the mclk pointer to NULL */