Skip to content

Commit

Permalink
Merge git://git.infradead.org/battery-2.6
Browse files Browse the repository at this point in the history
* git://git.infradead.org/battery-2.6:
  power_supply: Fix regression for 'type' property
  • Loading branch information
torvalds committed May 25, 2010
2 parents bf87eae + bbabb15 commit 4961ab9
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/power/power_supply_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4961ab9

Please sign in to comment.