Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next

diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 98ee9c79678df514b5cc43045ee0ebfc60a3a71a..53495753fbdb64849f3d14fa0094b045fff39acb 100644 (file)
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -149,7 +149,7 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map,
                        reg_offset = fpos_offset / map->debugfs_tot_len;
                        *pos = c->min + (reg_offset * map->debugfs_tot_len);
                        mutex_unlock(&map->cache_lock);
-                       return c->base_reg + reg_offset;
+                       return c->base_reg + (reg_offset * map->reg_stride);
                }
 
                *pos = c->max;
@@ -285,7 +285,7 @@ static ssize_t regmap_map_write_file(struct file *file,
                return -EINVAL;
 
        /* Userspace has been fiddling around behind the kernel's back */
-       add_taint(TAINT_USER, LOCKDEP_NOW_UNRELIABLE);
+       add_taint(TAINT_USER, LOCKDEP_STILL_OK);
 
        ret = regmap_write(map, reg, value);
        if (ret < 0)