Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Mar 6, 2015
2 parents 13a7a6a + cde72cc commit 90bc293
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3444,13 +3444,6 @@ static umode_t regulator_attr_is_visible(struct kobject *kobj,
if (attr == &dev_attr_requested_microamps.attr)
return rdev->desc->type == REGULATOR_CURRENT ? mode : 0;

/* all the other attributes exist to support constraints;
* don't show them if there are no constraints, or if the
* relevant supporting methods are missing.
*/
if (!rdev->constraints)
return 0;

/* constraints need specific supporting methods */
if (attr == &dev_attr_min_microvolts.attr ||
attr == &dev_attr_max_microvolts.attr)
Expand Down

0 comments on commit 90bc293

Please sign in to comment.