commit 67cc6885548427a4f7980b57e6ef32945f6d22b1
author Mark Brown <broonie@linaro.org> Wed Dec 11 22:54:38 2013 +0000
committer Mark Brown <broonie@linaro.org> Wed Dec 11 22:54:38 2013 +0000
tree 106a25e19dac241730b0e348c015a10b3849e6bf
parent 374b105797c3d4f29c685f3be535c35f5689b30e
parent 6389075eff7dc1e6db39203c968394486c13b3e2
parent 236c427cbc990e03ec8b39ce8ee9220705daeff9

Merge remote-tracking branches 'regulator/fix/as3722' and 'regulator/fix/pfuze100' into regulator-linus

drivers/regulator/as3722-regulator.c

diff --git a/drivers/regulator/as3722-regulator.c b/drivers/regulator/as3722-regulator.c
index 5917fe3..b9f1d24 100644
--- a/drivers/regulator/as3722-regulator.c
+++ b/drivers/regulator/as3722-regulator.c
@@ -590,8 +590,8 @@
 	default:
 		return -EINVAL;
 	}
+	ret <<= ffs(mask) - 1;
 	val = ret & mask;
-	val <<= ffs(mask) - 1;
 	return as3722_update_bits(as3722, reg, mask, val);
 }
 

drivers/regulator/pfuze100-regulator.c

diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index 032df37..8b5e4c7 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -38,7 +38,7 @@
 
 #define PFUZE100_DEVICEID	0x0
 #define PFUZE100_REVID		0x3
-#define PFUZE100_FABID		0x3
+#define PFUZE100_FABID		0x4
 
 #define PFUZE100_SW1ABVOL	0x20
 #define PFUZE100_SW1CVOL	0x2e