Skip to contentSkip to conversation

regmap: Add missing map->bus check

PATCH In review Marek Vasut 2 participants 2 messages May 9, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regmap: Add missing map->bus check

The map->bus can be NULL here, add the missing NULL pointer check.

Fixes d77e745613680 ("regmap: Add bulk read/write callbacks into regmap_config")
Cc Dan Carpenter <[email protected]>
Cc Mark Brown <[email protected]>

To: [email protected]

---
 drivers/base/regmap/regmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/regmap/regmap.c +1 -1
index 879a87a6461be..2221d98638317 100644
@@ -1839,7 +1839,7 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg,
 				 map->format.reg_bytes +
 				 map->format.pad_bytes +
 				 val_len);
-	else if (map->bus->gather_write)
+	else if (map->bus && map->bus->gather_write)
 		ret = map->bus->gather_write(map->bus_context, map->work_buf,
 					     map->format.reg_bytes +
 					     map->format.pad_bytes,
Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 3 lines · Marek Vasut

The map->bus can be NULL here, add the missing NULL pointer check.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next

Thanks!

[1/1] regmap: Add missing map->bus check

      commit: 5c422f0b970d287efa864b8390a02face404db5d

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark