ASoC: cs53l30: Do not ignore errors if mclk is specified
authorNicolin Chen <nicoleotsuka@gmail.com>
Thu, 28 Jul 2016 22:43:01 +0000 (15:43 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 8 Aug 2016 10:54:35 +0000 (11:54 +0100)
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>
sound/soc/codecs/cs53l30.c

index 2c0d9c4..227c556 100644 (file)
@@ -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 */