From 90ddc8db4d2f2402ed52ee3d059835c0b582ac89 Mon Sep 17 00:00:00 2001
From: "Mark A. Greer" <mgreer@animalcreek.com>
Date: Tue, 8 Jan 2013 11:57:41 -0700
Subject: [PATCH] --- yaml --- r: 357718 b: refs/heads/master c:
 0635fb3a3c6a6d1a70996428016dca6d3d8f0961 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/crypto/omap-aes.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2973c13ea74f..4092fce4b782 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5946c4a5e7707d255faf430969d344ad98430b69
+refs/heads/master: 0635fb3a3c6a6d1a70996428016dca6d3d8f0961
diff --git a/trunk/drivers/crypto/omap-aes.c b/trunk/drivers/crypto/omap-aes.c
index c2298521388c..3262139eb9bd 100644
--- a/trunk/drivers/crypto/omap-aes.c
+++ b/trunk/drivers/crypto/omap-aes.c
@@ -891,12 +891,31 @@ static int omap_aes_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int omap_aes_suspend(struct device *dev)
+{
+	pm_runtime_put_sync(dev);
+	return 0;
+}
+
+static int omap_aes_resume(struct device *dev)
+{
+	pm_runtime_get_sync(dev);
+	return 0;
+}
+#endif
+
+static const struct dev_pm_ops omap_aes_pm_ops = {
+	SET_SYSTEM_SLEEP_PM_OPS(omap_aes_suspend, omap_aes_resume)
+};
+
 static struct platform_driver omap_aes_driver = {
 	.probe	= omap_aes_probe,
 	.remove	= omap_aes_remove,
 	.driver	= {
 		.name	= "omap-aes",
 		.owner	= THIS_MODULE,
+		.pm	= &omap_aes_pm_ops,
 	},
 };