From 30d3caec501a1f0a2a62f98d610bb37629b9f44f Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 24 Jul 2011 11:46:20 +0100
Subject: [PATCH] --- yaml --- r: 266956 b: refs/heads/master c:
 73304781274200c341996f65220d36b3cda8e217 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/base/regmap/regmap.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8976ea329a18..c8e3c07e39c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb2736bbaee0e704a4f33912cf532597b2dc5b33
+refs/heads/master: 73304781274200c341996f65220d36b3cda8e217
diff --git a/trunk/drivers/base/regmap/regmap.c b/trunk/drivers/base/regmap/regmap.c
index 7d4dc11ad86c..e57f10f485a1 100644
--- a/trunk/drivers/base/regmap/regmap.c
+++ b/trunk/drivers/base/regmap/regmap.c
@@ -211,6 +211,13 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg,
 	void *buf;
 	int ret = -ENOTSUPP;
 	size_t len;
+	int i;
+
+	/* Check for unwritable registers before we start */
+	if (map->writeable_reg)
+		for (i = 0; i < val_len / map->format.val_bytes; i++)
+			if (!map->writeable_reg(map->dev, reg + i))
+				return -EINVAL;
 
 	map->format.format_reg(map->work_buf, reg);