Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur...

[linux-2.6-block.git] / drivers / mfd / twl6030-irq.c

diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index a014ec489e68bd6ab76f439b3451aa83985d01c7..3eee45ffb096e337d1e1aa67040532a14ff0b670 100644 (file)
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -32,6 +32,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/kthread.h>
@@ -109,7 +110,13 @@ static int twl6030_irq_pm_notifier(struct notifier_block *notifier,
                        twl_irq_wake_enabled = false;
                }
 
+               disable_irq(twl_irq);
                break;
+
+       case PM_POST_SUSPEND:
+               enable_irq(twl_irq);
+               break;
+
        default:
                break;
        }