summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-06 22:10:28 +0100
committerMark Brown <broonie@kernel.org>2015-03-06 22:10:28 +0100
commit90bc29347df64c2482fb28983857b87da2ce7094 (patch)
treea469e48ec6e8ddbb77a5ad6b409e0f42b1a8399f /drivers
parentLinux 4.0-rc2 (diff)
parentregulator: Fix regression due to NULL constraints check (diff)
downloadlinux-90bc29347df64c2482fb28983857b87da2ce7094.tar.xz
linux-90bc29347df64c2482fb28983857b87da2ce7094.zip
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/core.c7
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,
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)