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
mariux64 · Jun 10, 2008 · 849bf20 · 849bf20
2 parents d5301a0 + 56fa18e
commit 849bf20
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
 	}