diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-05-08 06:39:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-30 06:55:46 -0400 |
| commit | 3f4d6364084ca0525591836eba4a59f04bb85c68 (patch) | |
| tree | 034120298a2487edc38e6fdfcf586599501b61ac /drivers/regulator | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
regulator: palmas: Fix incorrect condition
Since 'id' cannot take two values at the same time, the condition
should probably be an OR (||) instead of AND (&&).
Introduced by commit 28d1e8cd67 ("regulator: palma: add ramp delay
support through regulator constraints").
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 92ceed0fc65e..ced74167a600 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c | |||
| @@ -840,7 +840,7 @@ static int palmas_regulators_probe(struct platform_device *pdev) | |||
| 840 | break; | 840 | break; |
| 841 | } | 841 | } |
| 842 | 842 | ||
| 843 | if ((id == PALMAS_REG_SMPS6) && (id == PALMAS_REG_SMPS8)) | 843 | if ((id == PALMAS_REG_SMPS6) || (id == PALMAS_REG_SMPS8)) |
| 844 | ramp_delay_support = true; | 844 | ramp_delay_support = true; |
| 845 | 845 | ||
| 846 | if (ramp_delay_support) { | 846 | if (ramp_delay_support) { |