power: supply: rk817: check correct variable
Subsystems (2)
PATCH 1/1 power: supply: rk817: check correct variable
This code checks "->chg_ps" twice when it was supposed to check "->bat_ps".
Fixes 11cb8da0189b ("power: supply: Add charger driver for Rockchip RK817")
Signed-off-by Dan Carpenter <[email protected]>
--- drivers/power/supply/rk817_charger.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/power/supply/rk817_charger.c +3 -5
@@ -1116,14 +1116,12 @@ static int rk817_charger_probe(struct platform_device *pdev) charger->bat_ps =devm_power_supply_register (&pdev->dev, &rk817_bat_desc, &pscfg); - - charger->chg_ps =devm_power_supply_register (&pdev->dev, - &rk817_chg_desc, &pscfg); - -if (IS_ERR (charger->chg_ps)) +if (IS_ERR (charger->bat_ps))return dev_err_probe (dev, -EINVAL ,"Battery failed to probe\n" ); + charger->chg_ps =devm_power_supply_register (&pdev->dev, + &rk817_chg_desc, &pscfg);if (IS_ERR (charger->chg_ps))return dev_err_probe (dev, -EINVAL ,"Charger failed to probe\n" );
Signature · 1 line
2.35.1
Hi,
Quoted 6 lines · Dan Carpenter
This code checks "->chg_ps" twice when it was supposed to check "->bat_ps".
Fixes 11cb8da0189b ("power: supply: Add charger driver for Rockchip RK817")Signed-off-by Dan Carpenter <[email protected]>---
Thanks, queued to fixes branch.
-- Sebastian
Quoted 28 lines
drivers/power/supply/rk817_charger.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/power/supply/rk817_charger.c +3
-5@@ -1116,14 +1116,12 @@ static int rk817_charger_probe(struct platform_device *pdev) charger->bat_ps =devm_power_supply_register (&pdev->dev, &rk817_bat_desc, &pscfg); - - charger->chg_ps =devm_power_supply_register (&pdev->dev, - &rk817_chg_desc, &pscfg); - -if (IS_ERR (charger->chg_ps)) +if (IS_ERR (charger->bat_ps))return dev_err_probe (dev, -EINVAL ,"Battery failed to probe\n" ); + charger->chg_ps =devm_power_supply_register (&pdev->dev, + &rk817_chg_desc, &pscfg);if (IS_ERR (charger->chg_ps))return dev_err_probe (dev, -EINVAL ,"Charger failed to probe\n" );Signature · 1 line
2.35.1
Quoted 5 lines · Dan Carpenter
This code checks "->chg_ps" twice when it was supposed to check "->bat_ps".
Fixes 11cb8da0189b ("power: supply: Add charger driver for Rockchip RK817")Signed-off-by Dan Carpenter <[email protected]>
Not sure how I missed this, but good catch. Sorry I've been away all week doing work stuff.
Tested-by Chris Morgan <[email protected]>
Quoted 29 lines
--- drivers/power/supply/rk817_charger.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/power/supply/rk817_charger.c +3
-5@@ -1116,14 +1116,12 @@ static int rk817_charger_probe(struct platform_device *pdev) charger->bat_ps =devm_power_supply_register (&pdev->dev, &rk817_bat_desc, &pscfg); - - charger->chg_ps =devm_power_supply_register (&pdev->dev, - &rk817_chg_desc, &pscfg); - -if (IS_ERR (charger->chg_ps)) +if (IS_ERR (charger->bat_ps))return dev_err_probe (dev, -EINVAL ,"Battery failed to probe\n" ); + charger->chg_ps =devm_power_supply_register (&pdev->dev, + &rk817_chg_desc, &pscfg);if (IS_ERR (charger->chg_ps))return dev_err_probe (dev, -EINVAL ,"Charger failed to probe\n" );Signature · 1 line
2.35.1