Merge tag 'fuse-update-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mszered...

[linux.git] / drivers / mfd / max8997.c

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index f99e8da99782e2d51520e428250e037622bde6f3..8c06c09e36d1179f44763dabdd0b5aaf412a0415 100644 (file)
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -448,6 +448,7 @@ static int max8997_suspend(struct device *dev)
        struct i2c_client *i2c = to_i2c_client(dev);
        struct max8997_dev *max8997 = i2c_get_clientdata(i2c);
 
+       disable_irq(max8997->irq);
        if (device_may_wakeup(dev))
                irq_set_irq_wake(max8997->irq, 1);
        return 0;
@@ -460,6 +461,7 @@ static int max8997_resume(struct device *dev)
 
        if (device_may_wakeup(dev))
                irq_set_irq_wake(max8997->irq, 0);
+       enable_irq(max8997->irq);
        return max8997_irq_resume(max8997);
 }