ASoC: codecs: rt5660: Simplify mclk initialization

[linux-2.6-microblaze.git] / sound / soc / codecs / rt5660.c

diff --git a/sound/soc/codecs/rt5660.c b/sound/soc/codecs/rt5660.c
index 0cecfd6..d5c2f0f 100644 (file)
--- a/sound/soc/codecs/rt5660.c
+++ b/sound/soc/codecs/rt5660.c
@@ -1079,9 +1079,6 @@ static int rt5660_set_bias_level(struct snd_soc_component *component,
                snd_soc_component_update_bits(component, RT5660_GEN_CTRL1,
                        RT5660_DIG_GATE_CTRL, RT5660_DIG_GATE_CTRL);
 
-               if (IS_ERR(rt5660->mclk))
-                       break;
-
                if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {
                        clk_disable_unprepare(rt5660->mclk);
                } else {
@@ -1277,9 +1274,9 @@ static int rt5660_i2c_probe(struct i2c_client *i2c)
                return -ENOMEM;
 
        /* Check if MCLK provided */
-       rt5660->mclk = devm_clk_get(&i2c->dev, "mclk");
-       if (PTR_ERR(rt5660->mclk) == -EPROBE_DEFER)
-               return -EPROBE_DEFER;
+       rt5660->mclk = devm_clk_get_optional(&i2c->dev, "mclk");
+       if (IS_ERR(rt5660->mclk))
+               return PTR_ERR(rt5660->mclk);
 
        i2c_set_clientdata(i2c, rt5660);