From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Sun, 8 Jun 2008 15:43:42 +0000 (+0400)
Subject: power_supply: Fix race in power_supply_uevent
X-Git-Tag: v2.6.26-rc6~20^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=56fa18e8f1ef6b3995a4511e61103d0f9205ff4a;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index c444d6b10c5..49215da5249 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;
 	}