* [PATCH] power: supply: rk817: check correct variable
@ 2022-10-15 8:26 Dan Carpenter
2022-10-19 23:43 ` Sebastian Reichel
2022-10-22 3:39 ` Chris Morgan
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2022-10-15 8:26 UTC (permalink / raw)
To: Sebastian Reichel, Chris Morgan
Cc: Lee Jones, Maya Matuszczyk, linux-pm, kernel-janitors
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 <dan.carpenter@oracle.com>
---
drivers/power/supply/rk817_charger.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c
index 635f051b0821..4e9c7b191266 100644
--- a/drivers/power/supply/rk817_charger.c
+++ b/drivers/power/supply/rk817_charger.c
@@ -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");
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] power: supply: rk817: check correct variable
2022-10-15 8:26 [PATCH] power: supply: rk817: check correct variable Dan Carpenter
@ 2022-10-19 23:43 ` Sebastian Reichel
2022-10-22 3:39 ` Chris Morgan
1 sibling, 0 replies; 3+ messages in thread
From: Sebastian Reichel @ 2022-10-19 23:43 UTC (permalink / raw)
To: Dan Carpenter
Cc: Chris Morgan, Lee Jones, Maya Matuszczyk, linux-pm,
kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1401 bytes --]
Hi,
On Sat, Oct 15, 2022 at 11:26:37AM +0300, Dan Carpenter wrote:
> 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 <dan.carpenter@oracle.com>
> ---
Thanks, queued to fixes branch.
-- Sebastian
> drivers/power/supply/rk817_charger.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c
> index 635f051b0821..4e9c7b191266 100644
> --- a/drivers/power/supply/rk817_charger.c
> +++ b/drivers/power/supply/rk817_charger.c
> @@ -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");
> --
> 2.35.1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] power: supply: rk817: check correct variable
2022-10-15 8:26 [PATCH] power: supply: rk817: check correct variable Dan Carpenter
2022-10-19 23:43 ` Sebastian Reichel
@ 2022-10-22 3:39 ` Chris Morgan
1 sibling, 0 replies; 3+ messages in thread
From: Chris Morgan @ 2022-10-22 3:39 UTC (permalink / raw)
To: Dan Carpenter
Cc: Sebastian Reichel, Lee Jones, Maya Matuszczyk, linux-pm,
kernel-janitors
On Sat, Oct 15, 2022 at 11:26:37AM +0300, Dan Carpenter wrote:
> 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 <dan.carpenter@oracle.com>
Not sure how I missed this, but good catch. Sorry I've been away all
week doing work stuff.
Tested-by: Chris Morgan <macromorgan@hotmail.com>
> ---
> drivers/power/supply/rk817_charger.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c
> index 635f051b0821..4e9c7b191266 100644
> --- a/drivers/power/supply/rk817_charger.c
> +++ b/drivers/power/supply/rk817_charger.c
> @@ -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");
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-22 3:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-15 8:26 [PATCH] power: supply: rk817: check correct variable Dan Carpenter
2022-10-19 23:43 ` Sebastian Reichel
2022-10-22 3:39 ` Chris Morgan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).