summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 08:16:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 08:16:34 -0700
commit4961ab934a1254b1ad9420cea0ded617b57f022b (patch)
treef48ee16ff167f1b54ef6608986ba8155194610b4 /drivers/power
parentbf87eae94880f1b79c2828d8705f0d97e961f168 (diff)
parentbbabb158f0e9d41174ae5c2183a8e4f981daf6ce (diff)
downloadlinux-4961ab934a1254b1ad9420cea0ded617b57f022b.tar.bz2
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: power_supply: Fix regression for 'type' property
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/power_supply_sysfs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 6a86cdfd79fa..9d30eeb8c810 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;