From 250f7e76af53c0239162433d8b7911e56a28575d Mon Sep 17 00:00:00 2001
From: Benson Leung <bleung@chromium.org>
Date: Wed, 6 Apr 2011 16:55:20 -0700
Subject: [PATCH] --- yaml --- r: 252135 b: refs/heads/master c:
 f10513de2a6036742b55e23278f0322f2e5c3772 h: refs/heads/master i:   252133:
 1f0cb1f2419710afe5094b4d9dea1df5fd2925ed   252131:
 34de7b5760b016e10eff4936f19008eeaf1f9bd9   252127:
 842ea7552aafa5939067242bf239ef6a7cc44d5f v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/power/gpio-charger.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f575c0d521c0..0e9f5243c3ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b14a9ccc1ddddfbc76b7cae06d02db4adf0ae1db
+refs/heads/master: f10513de2a6036742b55e23278f0322f2e5c3772
diff --git a/trunk/drivers/power/gpio-charger.c b/trunk/drivers/power/gpio-charger.c
index 25b88ac1d44c..718f2c537827 100644
--- a/trunk/drivers/power/gpio-charger.c
+++ b/trunk/drivers/power/gpio-charger.c
@@ -161,12 +161,27 @@ static int __devexit gpio_charger_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int gpio_charger_resume(struct device *dev)
+{
+	struct platform_device *pdev = to_platform_device(dev);
+	struct gpio_charger *gpio_charger = platform_get_drvdata(pdev);
+
+	power_supply_changed(&gpio_charger->charger);
+
+	return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(gpio_charger_pm_ops, NULL, gpio_charger_resume);
+
 static struct platform_driver gpio_charger_driver = {
 	.probe = gpio_charger_probe,
 	.remove = __devexit_p(gpio_charger_remove),
 	.driver = {
 		.name = "gpio-charger",
 		.owner = THIS_MODULE,
+		.pm = &gpio_charger_pm_ops,
 	},
 };