summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-06-08 19:43:42 +0400
committerAnton Vorontsov <cbouatmailru@gmail.com>2008-06-10 02:13:51 +0400
commit56fa18e8f1ef6b3995a4511e61103d0f9205ff4a (patch)
tree7d1bd03f812355c7354032cb941636512fd78220 /drivers/power
parentd563923011110a91bdbf1d89055c3e803ec01f0f (diff)
downloadop-kernel-dev-56fa18e8f1ef6b3995a4511e61103d0f9205ff4a.zip
op-kernel-dev-56fa18e8f1ef6b3995a4511e61103d0f9205ff4a.tar.gz
power_supply: Fix race in power_supply_uevent
Commit 54d29ad33e3483bcc7ca433a21cf294854e5154a (Power Supply: fix race in device_create) introduced a race in power_supply_uevent. Previously it checked that power_supply is available by checking for dev->driver_data. But now dev->driver_data is set before power_supply->dev is initialised. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
-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;
}
OpenPOWER on IntegriCloud