git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/cbou/linux-2.6
[pandora-kernel.git]
/
drivers
/
power
/
power_supply_sysfs.c
diff --git
a/drivers/power/power_supply_sysfs.c
b/drivers/power/power_supply_sysfs.c
index
82e1246
..
fe2aeb1
100644
(file)
--- 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;
}