Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36729
b: refs/heads/master
c: 360b9ab
h: refs/heads/master
i:
  36727: 3ebff3b
v: v3
  • Loading branch information
Hans de Goede authored and Greg Kroah-Hartman committed Sep 28, 2006
1 parent c2e1e70 commit 0d0f6bb
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b17ebc9402040959690b5a2c4e1cfb1e6d4fb206
refs/heads/master: 360b9ab220aedaf346380fc2344729d9acc3b075
30 changes: 28 additions & 2 deletions trunk/drivers/hwmon/abituguru.c
Original file line number Diff line number Diff line change
Expand Up @@ -1354,13 +1354,39 @@ static struct abituguru_data *abituguru_update_device(struct device *dev)
return NULL;
}

#ifdef CONFIG_PM
static int abituguru_suspend(struct platform_device *pdev, pm_message_t state)
{
struct abituguru_data *data = platform_get_drvdata(pdev);
/* make sure all communications with the uguru are done and no new
ones are started */
mutex_lock(&data->update_lock);
return 0;
}

static int abituguru_resume(struct platform_device *pdev)
{
struct abituguru_data *data = platform_get_drvdata(pdev);
/* See if the uGuru is still ready */
if (inb_p(data->addr + ABIT_UGURU_DATA) != ABIT_UGURU_STATUS_INPUT)
data->uguru_ready = 0;
mutex_unlock(&data->update_lock);
return 0;
}
#else
#define abituguru_suspend NULL
#define abituguru_resume NULL
#endif /* CONFIG_PM */

static struct platform_driver abituguru_driver = {
.driver = {
.owner = THIS_MODULE,
.name = ABIT_UGURU_NAME,
},
.probe = abituguru_probe,
.remove = __devexit_p(abituguru_remove),
.probe = abituguru_probe,
.remove = __devexit_p(abituguru_remove),
.suspend = abituguru_suspend,
.resume = abituguru_resume,
};

static int __init abituguru_detect(void)
Expand Down

0 comments on commit 0d0f6bb

Please sign in to comment.