Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penber...

[karo-tx-linux.git] / drivers / mfd / wm8994-regmap.c

diff --git a/drivers/mfd/wm8994-regmap.c b/drivers/mfd/wm8994-regmap.c
index 52e9e29449403b1d5b21dc215973f7e4b8de41e6..2fbce9c5950b5fb9657c3589f77e3b5fe5cf5726 100644 (file)
--- a/drivers/mfd/wm8994-regmap.c
+++ b/drivers/mfd/wm8994-regmap.c
@@ -1136,7 +1136,7 @@ static bool wm1811_volatile_register(struct device *dev, unsigned int reg)
 
        switch (reg) {
        case WM8994_GPIO_6:
-               if (wm8994->revision > 1)
+               if (wm8994->cust_id > 1 || wm8994->revision > 1)
                        return true;
                else
                        return false;