diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2011-02-28 17:37:13 +0300 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2011-02-28 17:37:13 +0300 |
| commit | b5db7cde69f87178fb771970a2b512a452a9d680 (patch) | |
| tree | 9936cb9f2fa9334ae770958fdbf18d42284fcc34 /drivers/power/power_supply_sysfs.c | |
| parent | d6ccc442b12102414c1343f0adacaa8a1aaa516c (diff) | |
| parent | 9e912f452931b3da9d13d716a381ba0d5fb74ced (diff) | |
Merge branch 'bq27x00-for-upstream' of git://git.metafoo.de/linux-2.6
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 cd1f90754a3..605514afc29 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -270,7 +270,7 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) attr = &power_supply_attrs[psy->properties[j]]; ret = power_supply_show_property(dev, attr, prop_buf); - if (ret == -ENODEV) { + if (ret == -ENODEV || ret == -ENODATA) { /* When a battery is absent, we expect -ENODEV. Don't abort; send the uevent with at least the the PRESENT=0 property */ ret = 0; |