Unverified Commit 4bcc6a0b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regmap/for-5.7' into regmap-linus

parents 9cb1fd0e 74edd08a

drivers/base/regmap/regmap-debugfs.c

+6 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ static ssize_t regmap_read_debugfs(struct regmap *map, unsigned int from, 
	if (*ppos < 0 || !count)

		return -EINVAL;



	if (count > (PAGE_SIZE << (MAX_ORDER - 1)))

		count = PAGE_SIZE << (MAX_ORDER - 1);



	buf = kmalloc(count, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;
@@ -371,6 +374,9 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file, 
	if (*ppos < 0 || !count)

		return -EINVAL;



	if (count > (PAGE_SIZE << (MAX_ORDER - 1)))

		count = PAGE_SIZE << (MAX_ORDER - 1);



	buf = kmalloc(count, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;