diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-04 17:33:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-04 17:33:56 +0100 |
| commit | ea09b3e21f18a5e190b26388c6c5f51e174d845f (patch) | |
| tree | f94dfc608ecf344f0509afe76963793984c12496 | |
| parent | 6fbc7275c7a9ba97877050335f290341a1fd8dbf (diff) | |
| parent | db057679de3e9e6a03c1bcd5aee09b0d25fd9f5b (diff) | |
| download | linux-ea09b3e21f18a5e190b26388c6c5f51e174d845f.tar.gz linux-ea09b3e21f18a5e190b26388c6c5f51e174d845f.tar.bz2 linux-ea09b3e21f18a5e190b26388c6c5f51e174d845f.zip | |
Merge branch 'regmap-5.2' into regmap-linus
| -rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 2 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 263f82516ff4..e5e1b3a01b1a 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -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; diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index f1025452bb39..19f57ccfbe1d 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -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) { |