diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-17 14:27:20 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-17 14:27:20 +0100 |
commit | 187c34f3f314201b8c0ddff1f6969069614fe8f8 (patch) | |
tree | a61ed7efbcd7c25bc3f1c0f8592564867f6edac3 | |
parent | 0529d0a163400840d3edbabefb3d6e36c52fe52e (diff) |
glamo: restore irq mask after resume.
-rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index e0e39409595..82a906a3cdc 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -1157,6 +1157,8 @@ static int glamo_suspend(struct device *dev) spin_lock(&glamo->lock); + glamo->saved_irq_mask = __reg_read(glamo, GLAMO_REG_IRQ_ENABLE); + /* nuke interrupts */ __reg_write(glamo, GLAMO_REG_IRQ_ENABLE, 0x200); @@ -1237,6 +1239,8 @@ static int glamo_resume(struct device *dev) } } + __reg_write(glamo, GLAMO_REG_IRQ_ENABLE, glamo->saved_irq_mask); + spin_unlock(&glamo->lock); return 0; |