Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

power: supply: max14577: Handle NULL pdata when CONFIG_OF is not set 

When the kernel is not configured  CONFIG_OF, the max14577_charger_dt_init
function returns NULL. Fix the max14577_charger_probe functionby returning
-ENODATA instead of potentially passing a NULL pointer to PTR_ERR.

This fixes the below smatch warning:
max14577_charger_probe() warn: passing zero to 'PTR_ERR'

Fixes: e30110e9c9 ("charger: max14577: Configure battery-dependent settings from DTS and sysfs")
Signed-off-by: Charles Han <hanchunchao@inspur.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20250519061601.8755-1-hanchunchao@inspur.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Charles Han 2025-05-19 14:16:01 +08:00 committed by Sebastian Reichel
parent a9aece5d7e
commit 2937f5d2e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/power/supply/max14577_charger.c
View File

@ -501,7 +501,7 @@ static struct max14577_charger_platform_data *max14577_charger_dt_init(
static struct max14577_charger_platform_data *max14577_charger_dt_init( static struct max14577_charger_platform_data *max14577_charger_dt_init(
struct platform_device *pdev) struct platform_device *pdev)
{ {
return NULL; return ERR_PTR(-ENODATA);
} }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
@ -572,7 +572,7 @@ static int max14577_charger_probe(struct platform_device *pdev)
chg->max14577 = max14577; chg->max14577 = max14577;
chg->pdata = max14577_charger_dt_init(pdev); chg->pdata = max14577_charger_dt_init(pdev);
if (IS_ERR_OR_NULL(chg->pdata)) if (IS_ERR(chg->pdata))
return PTR_ERR(chg->pdata); return PTR_ERR(chg->pdata);
ret = max14577_charger_reg_init(chg); ret = max14577_charger_reg_init(chg);