Unverified Commit 1d512ee8 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

regmap: debugfs: Fix more error path regressions 



Many error paths in __regmap_init rely on ret being pre-initialised to
-EINVAL, add an extra initialisation in after the new call to
regmap_set_name.

Fixes: 94cc89eb ("regmap: debugfs: Fix handling of name string for debugfs init delays")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20200918152212.22200-1-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0c2191c3

drivers/base/regmap/regmap.c

+2 −0
Original line number Diff line number Diff line
@@ -707,6 +707,8 @@ struct regmap *__regmap_init(struct device *dev, 
		}

	}



	ret = -EINVAL; /* Later error paths rely on this */



	if (config->disable_locking) {

		map->lock = map->unlock = regmap_lock_unlock_none;

		map->can_sleep = config->can_sleep;