From d43b2384104cd160d389b9cfc03021cb6b8e96eb Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Sat, 23 Jun 2007 17:16:29 -0700 Subject: [PATCH] --- yaml --- r: 57982 b: refs/heads/master c: 5136237bc392413332b02e69ada158c307da658f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/sm501.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 157d4394dc24..b28e1ac08d8d 100644 --- 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 index 4c4412e0de24..3a0ecfc404e9 100644 --- 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); }