[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250516095346.24169-1-hanchunchao@inspur.com>
Date: Fri, 16 May 2025 17:53:46 +0800
From: Charles Han <hanchunchao@...pur.com>
To: <krzk@...nel.org>, <sre@...nel.org>, <akpm@...ux-foundation.org>,
<lee@...nel.org>
CC: <linux-pm@...r.kernel.org>, <linux-kernel@...r.kernel.org>, Charles Han
<hanchunchao@...pur.com>
Subject: [PATCH] charger: 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.
Fix below smatch warning.
smatch warnings:
drivers/power/supply/max14577_charger.c:576 max14577_charger_probe() warn: passing zero to 'PTR_ERR'
Fixes: e30110e9c96f ("charger: max14577: Configure battery-dependent settings from DTS and sysfs")
Signed-off-by: Charles Han <hanchunchao@...pur.com>
---
drivers/power/supply/max14577_charger.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/power/supply/max14577_charger.c b/drivers/power/supply/max14577_charger.c
index 1cef2f860b5f..ed6f5a584c2c 100644
--- a/drivers/power/supply/max14577_charger.c
+++ b/drivers/power/supply/max14577_charger.c
@@ -572,8 +572,10 @@ static int max14577_charger_probe(struct platform_device *pdev)
chg->max14577 = max14577;
chg->pdata = max14577_charger_dt_init(pdev);
- if (IS_ERR_OR_NULL(chg->pdata))
+ if (IS_ERR(chg->pdata))
return PTR_ERR(chg->pdata);
+ else if (!chg->pdata)
+ return -ENODATA;
ret = max14577_charger_reg_init(chg);
if (ret)
--
2.43.0
Powered by blists - more mailing lists