summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Pargmann <mpa@pengutronix.de>2015-08-21 10:26:43 +0200
committerMark Brown <broonie@kernel.org>2015-08-21 09:33:43 -0700
commit9c9f7f675970ba1b888272f016157de21f69e7e2 (patch)
tree6ce5c3d958d77b93efd944c4b251734068c0ecf8
parent67921a1a6660d32cc2770d05d656a1187b6d94d5 (diff)
downloadlinux-stable-9c9f7f675970ba1b888272f016157de21f69e7e2.tar.gz
linux-stable-9c9f7f675970ba1b888272f016157de21f69e7e2.tar.bz2
linux-stable-9c9f7f675970ba1b888272f016157de21f69e7e2.zip
regmap: No multi_write support if bus->write does not exist
There is no multi_write support available if we cannot use raw_write. This is the case if bus->write is not implemented. This patch adds a condition that we need bus and bus->write so that can_multi_write is true. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/base/regmap/regmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index bc82fd34483b..27456c7978b9 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -578,7 +578,7 @@ struct regmap *regmap_init(struct device *dev,
map->reg_stride = 1;
map->use_single_read = config->use_single_rw || !bus || !bus->read;
map->use_single_write = config->use_single_rw || !bus || !bus->write;
- map->can_multi_write = config->can_multi_write;
+ map->can_multi_write = config->can_multi_write && bus && bus->write;
map->dev = dev;
map->bus = bus;
map->bus_context = bus_context;