Skip to contentSkip to conversation

regulator: pv88060: fix error handling in probe

PATCH In review Dan Carpenter 2 participants 2 messages Dec 1, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regulator: pv88060: fix error handling in probe

There were some missing "ret = " assignments here.

drivers/regulator/pv88060-regulator.c +2 -2
index 69893f2..094376c 100644
@@ -351,14 +351,14 @@ static int pv88060_i2c_probe(struct i2c_client *i2c,
 			return ret;
 		}
 
-		regmap_write(chip->regmap, PV88060_REG_MASK_B, 0xFF);
+		ret = regmap_write(chip->regmap, PV88060_REG_MASK_B, 0xFF);
 		if (ret < 0) {
 			dev_err(chip->dev,
 				"Failed to mask B reg: %d\n", ret);
 			return ret;
 		}
 
-		regmap_write(chip->regmap, PV88060_REG_MASK_C, 0xFF);
+		ret = regmap_write(chip->regmap, PV88060_REG_MASK_C, 0xFF);
 		if (ret < 0) {
 			dev_err(chip->dev,
 				"Failed to mask C reg: %d\n", ret);
maintainer
#1 lore raw

Applied "regulator: pv88060: fix error handling in probe" to the regulator tree

The patch

regulator: pv88060: fix error handling in probe

has been applied to the regulator tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git

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.

Thanks,
Mark

Quoted 1 line

From 3c0a2f64bcc14402cfdeca633e4210f33affa7a5 Mon Sep 17 00:00:00 2001

From: Dan Carpenter <[email protected]>
Date: Tue, 1 Dec 2015 11:29:12 +0300
Subject: [PATCH] regulator: pv88060: fix error handling in probe

There were some missing "ret = " assignments here.

---
 drivers/regulator/pv88060-regulator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/pv88060-regulator.c +2 -2
index 69893f28122a..094376c8de4b 100644
@@ -351,14 +351,14 @@ static int pv88060_i2c_probe(struct i2c_client *i2c,
 			return ret;
 		}
 
-		regmap_write(chip->regmap, PV88060_REG_MASK_B, 0xFF);
+		ret = regmap_write(chip->regmap, PV88060_REG_MASK_B, 0xFF);
 		if (ret < 0) {
 			dev_err(chip->dev,
 				"Failed to mask B reg: %d\n", ret);
 			return ret;
 		}
 
-		regmap_write(chip->regmap, PV88060_REG_MASK_C, 0xFF);
+		ret = regmap_write(chip->regmap, PV88060_REG_MASK_C, 0xFF);
 		if (ret < 0) {
 			dev_err(chip->dev,
 				"Failed to mask C reg: %d\n", ret);
Signature · 1 line
2.6.2