Merge branch 'glamo-2.6.32' into om-gta02-2.6.32

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;