ASoC: tpa6130a2: unmerge power enable error path from power disable path

Code undo operations in power enable errror path explicitly, instead of
reusing power disable path and playing with return values there.

Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 3b6faed91d7eac7151dea511fd33585cb9a2c5b8..3712db0881d0c8096351cf87d5c08702d239c0a5 100644 (file)
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -71,7 +71,14 @@ static int tpa6130a2_power(struct tpa6130a2_data *data, bool enable)
                if (ret != 0) {
                        dev_err(data->dev,
                                "Failed to sync registers: %d\n", ret);
-                       goto regcache_sync_failed;
+                       regcache_cache_only(data->regmap, true);
+                       if (data->power_gpio >= 0)
+                               gpio_set_value(data->power_gpio, 0);
+                       ret2 = regulator_disable(data->supply);
+                       if (ret2 != 0)
+                               dev_err(data->dev,
+                                       "Failed to disable supply: %d\n", ret2);
+                       return ret;
                }
        } else {
                /* Powered off device does not retain registers. While device
@@ -79,18 +86,17 @@ static int tpa6130a2_power(struct tpa6130a2_data *data, bool enable)
                 * happen in cache only.
                 */
                regcache_mark_dirty(data->regmap);
-regcache_sync_failed:
                regcache_cache_only(data->regmap, true);
 
                /* Power off */
                if (data->power_gpio >= 0)
                        gpio_set_value(data->power_gpio, 0);
 
-               ret2 = regulator_disable(data->supply);
-               if (ret2 != 0) {
+               ret = regulator_disable(data->supply);
+               if (ret != 0) {
                        dev_err(data->dev,
-                               "Failed to disable supply: %d\n", ret2);
-                       return ret ? ret : ret2;
+                               "Failed to disable supply: %d\n", ret);
+                       return ret;
                }
        }