Commit a973736a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap fix from Mark Brown:
 "A fix from Colin for a spelling mistake in a dev_warn() message"

* tag 'regmap-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: sdw-mbq: Fix spelling mistake "undeferable" -> "undeferrable"
parents 2b4d0215 4b7774ee

drivers/base/regmap/regmap-sdw-mbq.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int regmap_sdw_mbq_read(void *context, unsigned int reg, unsigned int *va 
	ret = regmap_sdw_mbq_read_impl(slave, reg, val, mbq_size);

	if (ret == -ENODATA) {

		if (!deferrable)

			dev_warn(dev, "Defer on undeferable control: %x\n", reg);

			dev_warn(dev, "Defer on undeferrable control: %x\n", reg);



		ret = regmap_sdw_mbq_poll_busy(slave, reg, ctx);

		if (ret)