Merge tag 'fuse-update-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mszered...

[linux.git] / drivers / mfd / arizona-core.c

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 5f1e37d23943a3986bcb416b42f4170fa8a478c5..27b61639cdc7e7073d7bf3cd5247ac371a75c37c 100644 (file)
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -52,8 +52,10 @@ int arizona_clk32k_enable(struct arizona *arizona)
                        if (ret != 0)
                                goto err_ref;
                        ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK1]);
-                       if (ret != 0)
-                               goto err_pm;
+                       if (ret != 0) {
+                               pm_runtime_put_sync(arizona->dev);
+                               goto err_ref;
+                       }
                        break;
                case ARIZONA_32KZ_MCLK2:
                        ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK2]);
@@ -67,8 +69,6 @@ int arizona_clk32k_enable(struct arizona *arizona)
                                         ARIZONA_CLK_32K_ENA);
        }
 
-err_pm:
-       pm_runtime_put_sync(arizona->dev);
 err_ref:
        if (ret != 0)
                arizona->clk32k_ref--;
@@ -990,7 +990,7 @@ static const struct mfd_cell wm8998_devs[] = {
 
 int arizona_dev_init(struct arizona *arizona)
 {
-       const char * const mclk_name[] = { "mclk1", "mclk2" };
+       static const char * const mclk_name[] = { "mclk1", "mclk2" };
        struct device *dev = arizona->dev;
        const char *type_name = NULL;
        unsigned int reg, val;