Commit 54d29ad3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Power Supply: fix race in device_create

There is a race from when a device is created with device_create() and
then the drvdata is set with a call to dev_set_drvdata() in which a
sysfs file could be open, yet the drvdata will be NULL, causing all
sorts of bad things to happen.

This patch fixes the problem by using the new function,
device_create_drvdata().

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0b00fc58
...@@ -91,15 +91,13 @@ int power_supply_register(struct device *parent, struct power_supply *psy) ...@@ -91,15 +91,13 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
{ {
int rc = 0; int rc = 0;
psy->dev = device_create(power_supply_class, parent, 0, psy->dev = device_create_drvdata(power_supply_class, parent, 0,
"%s", psy->name); psy, "%s", psy->name);
if (IS_ERR(psy->dev)) { if (IS_ERR(psy->dev)) {
rc = PTR_ERR(psy->dev); rc = PTR_ERR(psy->dev);
goto dev_create_failed; goto dev_create_failed;
} }
dev_set_drvdata(psy->dev, psy);
INIT_WORK(&psy->changed_work, power_supply_changed_work); INIT_WORK(&psy->changed_work, power_supply_changed_work);
rc = power_supply_create_attrs(psy); rc = power_supply_create_attrs(psy);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment