---

yaml --- r: 252135 b: refs/heads/master c: f10513d h: refs/heads/master i: 252133: 1f0cb1f 252131: 34de7b5 252127: 842ea75 v: v3
git-mirror · Apr 20, 2011 · 250f7e7 · 250f7e7
1 parent 23e2de5
commit 250f7e7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git 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
@@ -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,
 	},
 };