Message ID | 1469745781-31057-1-git-send-email-nicoleotsuka@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 4d48298af85aff3dcc9498a564e06efeb9c935be |
Headers | show |
On 7/28/16, 5:43 PM, "Nicolin Chen" <nicoleotsuka@gmail.com> wrote: >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> >--- > sound/soc/codecs/cs53l30.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c >index 2c0d9c4..227c556 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 */ Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c index 2c0d9c4..227c556 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 */
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> --- sound/soc/codecs/cs53l30.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)