From 187c34f3f314201b8c0ddff1f6969069614fe8f8 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sun, 17 Jan 2010 14:27:20 +0100 Subject: glamo: restore irq mask after resume. --- drivers/mfd/glamo/glamo-core.c | 4 ++++ 1 file changed, 4 insertions(+) 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; -- cgit v1.2.3