diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:34 +0000 |
| commit | a4dba88e6311ac51ea4328fea6fd000dc2948ddb (patch) | |
| tree | c6ee3f7d44a504e16679fc19eeb481f164f76177 /drivers/regulator/core.c | |
| parent | eb230d4a6120673938dddd1e4fbbf3ff6def2976 (diff) | |
| parent | 896b65f3453d434983969e3ee7c254f4f8ba1424 (diff) | |
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 98a6ec3240e..da9782bd27d 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; |