Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  power_supply: Fix regression for 'type' property

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 6a86cdfd79f..9d30eeb8c81 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -179,14 +179,16 @@ static mode_t power_supply_attr_is_visible(struct kobject *kobj,
 {
         struct device *dev = container_of(kobj, struct device, kobj);
         struct power_supply *psy = dev_get_drvdata(dev);
+        mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;
         int i;
 
+        if (attrno == POWER_SUPPLY_PROP_TYPE)
+                return mode;
+
         for (i = 0; i < psy->num_properties; i++) {
                 int property = psy->properties[i];
 
                 if (property == attrno) {
-                        mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;
-
                         if (psy->property_is_writeable &&
                             psy->property_is_writeable(psy, property) > 0)
                                 mode |= S_IWUSR;