diff --git a/[refs] b/[refs] index 226678417bc0..49581928d77d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab2b9260df67e29d5bd69d989f2f84f8c2ed4238 +refs/heads/master: 782baa20b201100e14ce065bb7b890169e7a5d3c diff --git a/trunk/drivers/mfd/twl6030-irq.c b/trunk/drivers/mfd/twl6030-irq.c index a014ec489e68..deec3ec858bf 100644 --- a/trunk/drivers/mfd/twl6030-irq.c +++ b/trunk/drivers/mfd/twl6030-irq.c @@ -109,7 +109,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; }