Merge branch 'pm-fixes' into pm-domains

Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.

Conflicts:
	drivers/base/power/clock_ops.c

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 5d1fca0277ef..f83103b8970d 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -135,10 +135,13 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
         max8997->dev = &i2c->dev;
         max8997->i2c = i2c;
         max8997->type = id->driver_data;
+        max8997->irq = i2c->irq;
 
         if (!pdata)
                 goto err;
 
+        max8997->irq_base = pdata->irq_base;
+        max8997->ono = pdata->ono;
         max8997->wakeup = pdata->wakeup;
 
         mutex_init(&max8997->iolock);
@@ -152,6 +155,8 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
 
         pm_runtime_set_active(max8997->dev);
 
+        max8997_irq_init(max8997);
+
         mfd_add_devices(max8997->dev, -1, max8997_devs,
                         ARRAY_SIZE(max8997_devs),
                         NULL, 0);