From 2913307da89e2a452c106906b565156476733d0c Mon Sep 17 00:00:00 2001 From: "Mark A. Greer" Date: Fri, 21 Dec 2012 10:04:03 -0700 Subject: [PATCH] --- yaml --- r: 357707 b: refs/heads/master c: 3b3f440023b3809c8eabec681768a4bcee15f2b4 h: refs/heads/master i: 357705: 536c2c079fc71f2b2e968acbfaa04dd1b919b6c7 357703: 7d61405b03d6d3169f199190b696607b0ce94c8d v: v3 --- [refs] | 2 +- trunk/drivers/crypto/omap-sham.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 08ba3ad3b7a8..b0c1a69a3410 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b359f034c8bf6c6ae4785c1172786ce73eccf9f2 +refs/heads/master: 3b3f440023b3809c8eabec681768a4bcee15f2b4 diff --git a/trunk/drivers/crypto/omap-sham.c b/trunk/drivers/crypto/omap-sham.c index 777eb9fdd096..9c3b096e15e8 100644 --- a/trunk/drivers/crypto/omap-sham.c +++ b/trunk/drivers/crypto/omap-sham.c @@ -1269,12 +1269,31 @@ static int __devexit omap_sham_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP +static int omap_sham_suspend(struct device *dev) +{ + pm_runtime_put_sync(dev); + return 0; +} + +static int omap_sham_resume(struct device *dev) +{ + pm_runtime_get_sync(dev); + return 0; +} +#endif + +static const struct dev_pm_ops omap_sham_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(omap_sham_suspend, omap_sham_resume) +}; + static struct platform_driver omap_sham_driver = { .probe = omap_sham_probe, .remove = omap_sham_remove, .driver = { .name = "omap-sham", .owner = THIS_MODULE, + .pm = &omap_sham_pm_ops, }, };