ASoC: wm8804: Fix small issues in probe error paths

This patch fixes some small issues on the probe error paths. Firstly,
fail probe if we can't register the regulator notifiers as this
will cause the cache to never be synchronised which will result in odd
behaviour if the regulators are controllable. Secondly, we don't need to
call regulator_bulk_disable if the enable fails, because the regulator
core will handle this clean up for us. Finally, we need to disable the
regulators if snd_soc_register_codecs fails.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 7804ddf53a04d4c6efce629a72728c56d73b8d7c..f44da83f50dc85d7e27572b798c965714f873336 100644 (file)
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -609,6 +609,7 @@ int wm8804_probe(struct device *dev, struct regmap *regmap)
                        dev_err(dev,
                                "Failed to register regulator notifier: %d\n",
                                ret);
+                       return ret;
                }
        }
 
@@ -616,7 +617,7 @@ int wm8804_probe(struct device *dev, struct regmap *regmap)
                                    wm8804->supplies);
        if (ret) {
                dev_err(dev, "Failed to enable supplies: %d\n", ret);
-               goto err_reg_enable;
+               return ret;
        }
 
        ret = regmap_read(regmap, WM8804_RST_DEVID1, &id1);
@@ -653,8 +654,14 @@ int wm8804_probe(struct device *dev, struct regmap *regmap)
                goto err_reg_enable;
        }
 
-       return snd_soc_register_codec(dev, &soc_codec_dev_wm8804,
-                                     &wm8804_dai, 1);
+       ret = snd_soc_register_codec(dev, &soc_codec_dev_wm8804,
+                                    &wm8804_dai, 1);
+       if (ret < 0) {
+               dev_err(dev, "Failed to register CODEC: %d\n", ret);
+               goto err_reg_enable;
+       }
+
+       return 0;
 
 err_reg_enable:
        regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies), wm8804->supplies);