aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-09 19:28:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-09 19:28:31 -0700
commit849bf20e732a71ca717a5c6f988bf3acc2a84a0c (patch)
treede4d00534631ba1ff4a2f1c58d5dbe4a52937d5b
parentd5301a0e884b0dced6e13837f00505f871e3458f (diff)
parent56fa18e8f1ef6b3995a4511e61103d0f9205ff4a (diff)
downloadkernel_samsung_aries-849bf20e732a71ca717a5c6f988bf3acc2a84a0c.zip
kernel_samsung_aries-849bf20e732a71ca717a5c6f988bf3acc2a84a0c.tar.gz
kernel_samsung_aries-849bf20e732a71ca717a5c6f988bf3acc2a84a0c.tar.bz2
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
-rw-r--r--drivers/power/power_supply_sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index c444d6b..49215da 100644
--- 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;
}