Merge tag 'staging-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

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

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index a45aab9f6bb135e64c0f0a420f75ed2508e17e92..1c3ae57082ed7bc1a2dcd8583a507875f3b7d92b 100644 (file)
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -251,8 +251,6 @@ static int arizona_apply_hardware_patch(struct arizona* arizona)
        unsigned int fll, sysclk;
        int ret, err;
 
-       regcache_cache_bypass(arizona->regmap, true);
-
        /* Cache existing FLL and SYSCLK settings */
        ret = regmap_read(arizona->regmap, ARIZONA_FLL1_CONTROL_1, &fll);
        if (ret != 0) {
@@ -322,8 +320,6 @@ err_fll:
                        err);
        }
 
-       regcache_cache_bypass(arizona->regmap, false);
-
        if (ret != 0)
                return ret;
        else