Merge remote-tracking branches 'regmap/fix/i2c' and 'regmap/fix/volatile' into regmap...

[muen/linux.git] / drivers / base / regmap / regmap.c

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index c7b7c5fa73ab46bce54ae1dcad332e271cda3d48..2339b98f1b6e49d70906215ad7c989a98be009c7 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -174,7 +174,7 @@ static bool regmap_volatile_range(struct regmap *map, unsigned int reg,
        unsigned int i;
 
        for (i = 0; i < num; i++)
-               if (!regmap_volatile(map, reg + i))
+               if (!regmap_volatile(map, reg + regmap_get_offset(map, i)))
                        return false;
 
        return true;