Merge git://git.infradead.org/users/cbou/battery-2.6.26

* git://git.infradead.org/users/cbou/battery-2.6.26: power_supply: Fix race in power_supply_uevent
2008-06-09 19:28:31 -07:00 · 2008-06-09 19:28:31 -07:00 · 849bf20e73
parent d5301a0e88 56fa18e8f1
commit 849bf20e73
1 changed files with 1 additions and 1 deletions
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@ -201,7 +201,7 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env)

 	dev_dbg(dev, "uevent\n");

-	if (!psy) {
+	if (!psy || !psy->dev) {
 		dev_dbg(dev, "No power supply yet\n");
 		return ret;
 	}