From 51f2f805e291747c0b7d595ef40176a6c29d68f2 Mon Sep 17 00:00:00 2001 From: Jonghwan Choi Date: Tue, 29 Nov 2011 17:17:51 +0900 Subject: [PATCH] --- yaml --- r: 284558 b: refs/heads/master c: 7ef73598d4ca8add089d5eb9f3b78e9540a1a98d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/max8998.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc0964b90635..4d740f1e2e0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdd6a67a3936f4da5ef382ec640b8d1eb1f209fa +refs/heads/master: 7ef73598d4ca8add089d5eb9f3b78e9540a1a98d diff --git a/trunk/drivers/mfd/max8998.c b/trunk/drivers/mfd/max8998.c index de4096aee248..6ef56d28c056 100644 --- a/trunk/drivers/mfd/max8998.c +++ b/trunk/drivers/mfd/max8998.c @@ -176,6 +176,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c, if (ret < 0) goto err; + device_init_wakeup(max8998->dev, max8998->wakeup); + return ret; err: @@ -210,7 +212,7 @@ static int max8998_suspend(struct device *dev) struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct max8998_dev *max8998 = i2c_get_clientdata(i2c); - if (max8998->wakeup) + if (device_may_wakeup(dev)) irq_set_irq_wake(max8998->irq, 1); return 0; } @@ -220,7 +222,7 @@ static int max8998_resume(struct device *dev) struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct max8998_dev *max8998 = i2c_get_clientdata(i2c); - if (max8998->wakeup) + if (device_may_wakeup(dev)) irq_set_irq_wake(max8998->irq, 0); /* * In LP3974, if IRQ registers are not "read & clear"