From 693c5b86a25bc7ccdaca90f52da589945036233a Mon Sep 17 00:00:00 2001 From: Marc Pignat Date: Wed, 15 Oct 2008 22:02:56 -0700 Subject: [PATCH] --- yaml --- r: 114805 b: refs/heads/master c: 986e36a5b817de01733d46aa623406106d661cec h: refs/heads/master i: 114803: 9134bc5b7a56ac461750f2c45a26cb04cdd23645 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-ds1374.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1f1bb24434bd..b771814edbb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d5b4d74f9ae85bbd558a708678b6927f962e75d +refs/heads/master: 986e36a5b817de01733d46aa623406106d661cec diff --git a/trunk/drivers/rtc/rtc-ds1374.c b/trunk/drivers/rtc/rtc-ds1374.c index a150418fba76..a5b0fc09f0c6 100644 --- a/trunk/drivers/rtc/rtc-ds1374.c +++ b/trunk/drivers/rtc/rtc-ds1374.c @@ -429,12 +429,33 @@ static int __devexit ds1374_remove(struct i2c_client *client) return 0; } +#ifdef CONFIG_PM +static int ds1374_suspend(struct i2c_client *client, pm_message_t state) +{ + if (client->irq >= 0 && device_may_wakeup(&client->dev)) + enable_irq_wake(client->irq); + return 0; +} + +static int ds1374_resume(struct i2c_client *client) +{ + if (client->irq >= 0 && device_may_wakeup(&client->dev)) + disable_irq_wake(client->irq); + return 0; +} +#else +#define ds1374_suspend NULL +#define ds1374_resume NULL +#endif + static struct i2c_driver ds1374_driver = { .driver = { .name = "rtc-ds1374", .owner = THIS_MODULE, }, .probe = ds1374_probe, + .suspend = ds1374_suspend, + .resume = ds1374_resume, .remove = __devexit_p(ds1374_remove), .id_table = ds1374_id, };