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

Unverified Commit ea09b3e2 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regmap-5.2' into regmap-linus

parents 6fbc7275 db057679

drivers/base/regmap/regmap-debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -579,6 +579,8 @@ void regmap_debugfs_init(struct regmap *map, const char *name) 
	}



	if (!strcmp(name, "dummy")) {

		kfree(map->debugfs_name);



		map->debugfs_name = kasprintf(GFP_KERNEL, "dummy%d",

						dummy_index);

		name = map->debugfs_name;

drivers/base/regmap/regmap.c

+2 −0
Original line number Diff line number Diff line
@@ -1637,6 +1637,8 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg, 
					     map->format.reg_bytes +

					     map->format.pad_bytes,

					     val, val_len);

	else

		ret = -ENOTSUPP;



	/* If that didn't work fall back on linearising by hand. */

	if (ret == -ENOTSUPP) {