---

yaml --- r: 57982 b: refs/heads/master c: 5136237 h: refs/heads/master v: v3
git-mirror · Jun 24, 2007 · d43b238 · d43b238
1 parent c9cfefd
commit d43b238
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5913bbd2ddebd9c2c6841986c29376e691dd396
+refs/heads/master: 5136237bc392413332b02e69ada158c307da658f
diff --git a/trunk/drivers/mfd/sm501.c b/trunk/drivers/mfd/sm501.c
@@ -813,6 +813,9 @@ static DEVICE_ATTR(dbg_regs, 0666, sm501_dbg_regs, NULL);
 /* sm501_init_reg
  *
  * Helper function for the init code to setup a register
+ *
+ * clear the bits which are set in r->mask, and then set
+ * the bits set in r->set.
 */
 
 static inline void sm501_init_reg(struct sm501_devdata *sm,
@@ -822,8 +825,8 @@ static inline void sm501_init_reg(struct sm501_devdata *sm,
 	unsigned long tmp;
 
 	tmp = readl(sm->regs + reg);
-	tmp |= r->set;
 	tmp &= ~r->mask;
+	tmp |= r->set;
 	writel(tmp, sm->regs + reg);
 }