summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorNicolin Chen <nicoleotsuka@gmail.com>2016-07-28 15:43:01 -0700
committerMark Brown <broonie@kernel.org>2016-08-08 11:54:35 +0100
commit4d48298af85aff3dcc9498a564e06efeb9c935be (patch)
tree2dbb34d9f37d727a351eb6f6c6b6b7ae26feaf4c /sound
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
downloadtalos-obmc-linux-4d48298af85aff3dcc9498a564e06efeb9c935be.tar.gz
talos-obmc-linux-4d48298af85aff3dcc9498a564e06efeb9c935be.zip
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/cs53l30.c4
1 files changed, 2 insertions, 2 deletions
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 */
OpenPOWER on IntegriCloud