diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-06 16:10:28 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-06 16:10:28 -0500 |
| commit | 90bc29347df64c2482fb28983857b87da2ce7094 (patch) | |
| tree | a469e48ec6e8ddbb77a5ad6b409e0f42b1a8399f | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
| parent | cde72ccfdd5920abb0413d16240c1551de3bd13a (diff) | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
| -rw-r--r-- | drivers/regulator/core.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index b899947d839d..1245dca79009 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
| @@ -3444,13 +3444,6 @@ static umode_t regulator_attr_is_visible(struct kobject *kobj, | |||
| 3444 | if (attr == &dev_attr_requested_microamps.attr) | 3444 | if (attr == &dev_attr_requested_microamps.attr) |
| 3445 | return rdev->desc->type == REGULATOR_CURRENT ? mode : 0; | 3445 | return rdev->desc->type == REGULATOR_CURRENT ? mode : 0; |
| 3446 | 3446 | ||
| 3447 | /* all the other attributes exist to support constraints; | ||
| 3448 | * don't show them if there are no constraints, or if the | ||
| 3449 | * relevant supporting methods are missing. | ||
| 3450 | */ | ||
| 3451 | if (!rdev->constraints) | ||
| 3452 | return 0; | ||
| 3453 | |||
| 3454 | /* constraints need specific supporting methods */ | 3447 | /* constraints need specific supporting methods */ |
| 3455 | if (attr == &dev_attr_min_microvolts.attr || | 3448 | if (attr == &dev_attr_min_microvolts.attr || |
| 3456 | attr == &dev_attr_max_microvolts.attr) | 3449 | attr == &dev_attr_max_microvolts.attr) |
