diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2011-02-21 15:34:19 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2011-02-22 11:01:42 +0100 |
commit | 97774672573ac4355bd12cf84b202555c1131b69 (patch) | |
tree | cf5bde9f2f55faa6cdcd0a6ab39ef58e982d4a06 /drivers/power | |
parent | f722e17fdb2c97bbec2563636dd88489cdb1428b (diff) | |
download | op-kernel-dev-97774672573ac4355bd12cf84b202555c1131b69.zip op-kernel-dev-97774672573ac4355bd12cf84b202555c1131b69.tar.gz |
power_supply: Initialize changed_work before calling device_add
Calling device_add causes an inital uevent for that device to be generated.
The power_supply uevent function calls the drivers get_property function,
which might causes the driver to update its state, which again might
causes the driver to call power_supply_changed(). Since the power_supplys
changed_work has not been initialized at this point the behavior is
undefined and can result in an OOPS.
This patch fixes the issue by initializing the power_supplys changed_work
prior to adding the power_supplys device to the device tree.
Reported-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/power_supply_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 970f733..329b46b 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -171,6 +171,8 @@ int power_supply_register(struct device *parent, struct power_supply *psy) dev_set_drvdata(dev, psy); psy->dev = dev; + INIT_WORK(&psy->changed_work, power_supply_changed_work); + rc = kobject_set_name(&dev->kobj, "%s", psy->name); if (rc) goto kobject_set_name_failed; @@ -179,8 +181,6 @@ int power_supply_register(struct device *parent, struct power_supply *psy) if (rc) goto device_add_failed; - INIT_WORK(&psy->changed_work, power_supply_changed_work); - rc = power_supply_create_triggers(psy); if (rc) goto create_triggers_failed; |