summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 12:42:34 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 12:42:34 +0000
commita4dba88e6311ac51ea4328fea6fd000dc2948ddb (patch)
treec6ee3f7d44a504e16679fc19eeb481f164f76177 /drivers/regulator/core.c
parenteb230d4a6120673938dddd1e4fbbf3ff6def2976 (diff)
parent896b65f3453d434983969e3ee7c254f4f8ba1424 (diff)
downloadop-kernel-dev-a4dba88e6311ac51ea4328fea6fd000dc2948ddb.zip
op-kernel-dev-a4dba88e6311ac51ea4328fea6fd000dc2948ddb.tar.gz
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
Diffstat (limited to 'drivers/regulator/core.c')
-rw-r--r--drivers/regulator/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 98a6ec3..da9782b 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3233,7 +3233,7 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
if (status < 0)
return status;
}
- if (ops->is_enabled) {
+ if (rdev->ena_gpio || ops->is_enabled) {
status = device_create_file(dev, &dev_attr_state);
if (status < 0)
return status;
OpenPOWER on IntegriCloud