Applied "regulator: stpmic1: Return REGULATOR_MODE_INVALID for invalid mode" to the regulator tree
- Date: Wed, 10 Oct 2018 15:40:27 +0100 (BST)
- From: Mark Brown <broonie@xxxxxxxxxx>
- Subject: Applied "regulator: stpmic1: Return REGULATOR_MODE_INVALID for invalid mode" to the regulator tree
regulator: stpmic1: Return REGULATOR_MODE_INVALID for invalid mode
has been applied to the regulator tree at
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
>From c18fb34ae185ad3b2444cd5e308ef5f91d8c9a46 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@xxxxxxxxxx>
Date: Tue, 9 Oct 2018 16:52:21 +0800
Subject: [PATCH] regulator: stpmic1: Return REGULATOR_MODE_INVALID for invalid
-EINVAL is not a valid return value for .of_map_mode, return
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
drivers/regulator/stpmic1_regulator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/regulator/stpmic1_regulator.c b/drivers/regulator/stpmic1_regulator.c
index 96f18083a3b6..e15634edb8ce 100644
@@ -441,7 +441,7 @@ static unsigned int stpmic1_map_mode(unsigned int mode)
- return -EINVAL;
+ return REGULATOR_MODE_INVALID;