Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next
This commit is contained in:
commit
ad4f496b44
|
@ -149,7 +149,7 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map,
|
||||||
reg_offset = fpos_offset / map->debugfs_tot_len;
|
reg_offset = fpos_offset / map->debugfs_tot_len;
|
||||||
*pos = c->min + (reg_offset * map->debugfs_tot_len);
|
*pos = c->min + (reg_offset * map->debugfs_tot_len);
|
||||||
mutex_unlock(&map->cache_lock);
|
mutex_unlock(&map->cache_lock);
|
||||||
return c->base_reg + reg_offset;
|
return c->base_reg + (reg_offset * map->reg_stride);
|
||||||
}
|
}
|
||||||
|
|
||||||
*pos = c->max;
|
*pos = c->max;
|
||||||
|
@ -285,7 +285,7 @@ static ssize_t regmap_map_write_file(struct file *file,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* Userspace has been fiddling around behind the kernel's back */
|
/* 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);
|
ret = regmap_write(map, reg, value);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
|
|
Loading…
Reference in New Issue