Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f4d6364 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mark Brown
Browse files

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 28d1e8cd ("regulator: palma: add ramp delay
support through regulator constraints").

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e4aa937e

drivers/regulator/palmas-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static int palmas_regulators_probe(struct platform_device *pdev) 
			break;

		}



		if ((id == PALMAS_REG_SMPS6) && (id == PALMAS_REG_SMPS8))

		if ((id == PALMAS_REG_SMPS6) || (id == PALMAS_REG_SMPS8))

			ramp_delay_support = true;



		if (ramp_delay_support) {