power: supply: ucs1002: Fix wrong return value checking
diff mbox series

Message ID 20190509125614.28921-1-axel.lin@ingics.com
State Not Applicable, archived
Headers show
Series
  • power: supply: ucs1002: Fix wrong return value checking
Related show

Commit Message

Axel Lin May 9, 2019, 12:56 p.m. UTC
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>
---
This patch replaces my previous patches:
[PATCH] power: supply: ucs1002: Fix checking return value of devm_regulator_register
[PATCH] power: supply: ucs1002: Fix checking return value of devm_regmap_init_i2c

BTW, I though Fixes tag is mainly for backport stable commit which is not this case.
Anyway, added fixes tag base on the comment of Enric Balletbo i Serra.

 drivers/power/supply/ucs1002_power.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Andrey Smirnov May 9, 2019, 7:14 p.m. UTC | #1
On Thu, May 9, 2019 at 5:56 AM Axel Lin <axel.lin@ingics.com> wrote:
>
> 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>

Ugh, sorry about that.

Reviewed-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Sebastian Reichel May 9, 2019, 7:44 p.m. UTC | #2
Hi,

On Thu, May 09, 2019 at 12:14:24PM -0700, Andrey Smirnov wrote:
> On Thu, May 9, 2019 at 5:56 AM Axel Lin <axel.lin@ingics.com> wrote:
> >
> > 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>
> 
> Ugh, sorry about that.
> 
> Reviewed-by: Andrey Smirnov <andrew.smirnov@gmail.com>

Thanks, queued.

-- Sebastian

Patch
diff mbox series

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;