Skip to content

Commit

Permalink
Power Supply: fix race in device_create
Browse files Browse the repository at this point in the history
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: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed May 20, 2008
1 parent 0b00fc5 commit 54d29ad
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/power/power_supply_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,13 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
{
int rc = 0;

psy->dev = device_create(power_supply_class, parent, 0,
"%s", psy->name);
psy->dev = device_create_drvdata(power_supply_class, parent, 0,
psy, "%s", psy->name);
if (IS_ERR(psy->dev)) {
rc = PTR_ERR(psy->dev);
goto dev_create_failed;
}

dev_set_drvdata(psy->dev, psy);

INIT_WORK(&psy->changed_work, power_supply_changed_work);

rc = power_supply_create_attrs(psy);
Expand Down

0 comments on commit 54d29ad

Please sign in to comment.