Commit 6d66df41 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regmap/fix/core' into tmp

parents 7ff2b193 c6432ea9

drivers/base/regmap/regmap.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -710,12 +710,12 @@ struct regmap *regmap_init(struct device *dev, 
		}

		}

	}

	}





	regmap_debugfs_init(map, config->name);



	ret = regcache_init(map, config);

	ret = regcache_init(map, config);

	if (ret != 0)

	if (ret != 0)

		goto err_range;

		goto err_range;





	regmap_debugfs_init(map, config->name);



	/* Add a devres resource for dev_get_regmap() */

	/* Add a devres resource for dev_get_regmap() */

	m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL);

	m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL);

	if (!m) {

	if (!m) {