Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Mark Brown 2013-06-30 12:40:02 +01:00
commit ad4f496b44
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/base/regmap/regmap-debugfs.c
View file

@ -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)