Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 998a4f2f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regmap/fix/debugfs' into regmap-linus

parents 59e618a6 68e850d8

drivers/base/regmap/regmap-debugfs.c

+4 −1
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ static ssize_t regmap_map_write_file(struct file *file, 
	char *start = buf;

	unsigned long reg, value;

	struct regmap *map = file->private_data;

	int ret;



	buf_size = min(count, (sizeof(buf)-1));

	if (copy_from_user(buf, user_buf, buf_size))
@@ -282,7 +283,9 @@ static ssize_t regmap_map_write_file(struct file *file, 
	/* Userspace has been fiddling around behind the kernel's back */

	add_taint(TAINT_USER, LOCKDEP_NOW_UNRELIABLE);



	regmap_write(map, reg, value);

	ret = regmap_write(map, reg, value);

	if (ret < 0)

		return ret;

	return buf_size;

}

#else