diff options
| author | Rhyland Klein <rklein@nvidia.com> | 2016-06-22 17:45:52 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2016-07-01 22:44:34 +0200 |
| commit | e380538529e83c5d3fd27e8cbfcc1f9799cb6bbb (patch) | |
| tree | a3893523e57344dd71c906c137987ff233bd31b4 /drivers/power/power_supply_sysfs.c | |
| parent | power: qcom_smbb: Make an extcon for usb cable detection (diff) | |
| download | linux-e380538529e83c5d3fd27e8cbfcc1f9799cb6bbb.tar.xz linux-e380538529e83c5d3fd27e8cbfcc1f9799cb6bbb.zip | |
power_supply: fix return value of get_property
power_supply_get_property() should ideally return -EAGAIN if it is
called while the power_supply is being registered. There was no way
previously to determine if use_cnt == 0 meant that the power_supply
wasn't fully registered yet, or if it had already been unregistered.
Add a new boolean to the power_supply struct to simply show if
registration is completed. Lastly, modify the check in
power_supply_show_property() to also ignore -EAGAIN when so it
doesn't complain about not returning the property.
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power/power_supply_sysfs.c')
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 80fed98832f9..bcde8d13476a 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -83,7 +83,7 @@ static ssize_t power_supply_show_property(struct device *dev, if (ret == -ENODATA) dev_dbg(dev, "driver has no data for `%s' property\n", attr->attr.name); - else if (ret != -ENODEV) + else if (ret != -ENODEV && ret != -EAGAIN) dev_err(dev, "driver failed to report `%s' property: %zd\n", attr->attr.name, ret); return ret; |