---

yaml --- r: 329947 b: refs/heads/master c: 1de74cf h: refs/heads/master i: 329945: ab16dcb 329943: 09a5852 v: v3
git-mirror · Sep 14, 2012 · fc3a89c · fc3a89c
1 parent 15e97a6
commit fc3a89c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3080de4ef62f0cc1910b227d33d3533f3c4a4a5d
+refs/heads/master: 1de74cfd69077c06507f444d7192aefc17784ab5
diff --git a/trunk/drivers/mfd/wm8994-regmap.c b/trunk/drivers/mfd/wm8994-regmap.c
@@ -1136,7 +1136,7 @@ static bool wm1811_volatile_register(struct device *dev, unsigned int reg)
 
 	switch (reg) {
 	case WM8994_GPIO_6:
-		if (wm8994->revision > 1)
+		if (wm8994->cust_id > 1 || wm8994->revision > 1)
 			return true;
 		else
 			return false;