summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorAxel Lin2019-05-09 14:56:14 +0200
committerSebastian Reichel2019-05-09 21:44:15 +0200
commit09eb8b7c5adcc5d1d1908d78237dd7ae1d8605b6 (patch)
tree6c299b88547bd317b9bf548e96b91c7e455c4646 /drivers/power
parentpower: supply: Add driver for Microchip UCS1002 (diff)
downloadkernel-qcow2-linux-09eb8b7c5adcc5d1d1908d78237dd7ae1d8605b6.tar.gz
kernel-qcow2-linux-09eb8b7c5adcc5d1d1908d78237dd7ae1d8605b6.tar.xz
kernel-qcow2-linux-09eb8b7c5adcc5d1d1908d78237dd7ae1d8605b6.zip
power: supply: ucs1002: Fix wrong return value checking
Fix wrong return value checking for devm_regulator_register and devm_regmap_init_i2c. This looks like a copy-n-paste mistake. Fixes: 9a2688e42638 ("power: supply: Add driver for Microchip UCS1002") Signed-off-by: Axel Lin <axel.lin@ingics.com> Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Reviewed-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/supply/ucs1002_power.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/supply/ucs1002_power.c b/drivers/power/supply/ucs1002_power.c
index d66b4eff9b7a..1c89d030c045 100644
--- a/drivers/power/supply/ucs1002_power.c
+++ b/drivers/power/supply/ucs1002_power.c
@@ -508,7 +508,7 @@ static int ucs1002_probe(struct i2c_client *client,
return -ENOMEM;
info->regmap = devm_regmap_init_i2c(client, &regmap_config);
- ret = PTR_ERR_OR_ZERO(info->charger);
+ ret = PTR_ERR_OR_ZERO(info->regmap);
if (ret) {
dev_err(dev, "Regmap initialization failed: %d\n", ret);
return ret;
@@ -592,7 +592,7 @@ static int ucs1002_probe(struct i2c_client *client,
rdev = devm_regulator_register(dev, info->regulator_descriptor,
&regulator_config);
- ret = PTR_ERR_OR_ZERO(info->charger);
+ ret = PTR_ERR_OR_ZERO(rdev);
if (ret) {
dev_err(dev, "Failed to register VBUS regulator: %d\n", ret);
return ret;