]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
regmap: Add missing map->bus check
authorMarek Vasut <marex@denx.de>
Mon, 9 May 2022 00:30:35 +0000 (02:30 +0200)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:37 +0000 (18:21 -0400)
[ Upstream commit 5c422f0b970d287efa864b8390a02face404db5d ]

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

Fixes: d77e745613680 ("regmap: Add bulk read/write callbacks into regmap_config")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Mark Brown <broonie@kernel.org>
To: linux-kernel@vger.kernel.org
Link: https://lore.kernel.org/r/20220509003035.225272-1-marex@denx.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/base/regmap/regmap.c

index 6adb345866610fa54bda8b1a2bd5b3b6c56e48f6..893b0615935e95ad4bbd673512570118258a7e45 100644 (file)
@@ -1836,7 +1836,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,