Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

	drivers/power/Kconfig
	drivers/power/Makefile

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 82e1246eeb0a..fe2aeb11939b 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -202,7 +202,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;
         }