regulator: da9063: Fix PTR_ERR/ERR_PTR mismatch
PATCH 1/2 regulator: da9063: Fix PTR_ERR/ERR_PTR mismatch
If CONFIG_OF=n:
drivers/regulator/da9063-regulator.c: In function ‘da9063_parse_regulators_dt’:drivers/regulator/da9063-regulator.c:712: warning: passing argument 1 of ‘PTR_ERR’ makes pointer from integer without a cast drivers/regulator/da9063-regulator.c:712: warning: return makes pointer from integer without a cast
Use ERR_PTR() to encode an error code in a pointer. PTR_ERR() is meant to decode an error code from a pointer.
--- drivers/regulator/da9063-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/da9063-regulator.c +1 -1
@@ -709,7 +709,7 @@ static struct da9063_regulators_pdata *da9063_parse_regulators_dt( struct of_regulator_match **da9063_reg_matches) { da9063_reg_matches =NULL ; -return PTR_ERR (-ENODEV ); +return ERR_PTR (-ENODEV ); }#endif
Signature · 1 line
1.7.9.5
PATCH 2/2 regulator: da9063: Add missing initialization of da9063_reg_matches
With gcc 4.1.2:
drivers/regulator/da9063-regulator.c: In function ‘da9063_regulator_probe’:drivers/regulator/da9063-regulator.c:847: warning: ‘da9063_reg_matches’ is used uninitialized in this function
If the parent device already has platform data, da9063_reg_matches will not be initialized.
---
Can this happen? Or will any of the b*_merged flags be set in this case, so the while loop continues and we never get to the place where da9063_reg_matches is used? The code is too convoluted for me to see...
drivers/regulator/da9063-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/da9063-regulator.c +1 -1
@@ -717,7 +717,7 @@ static int da9063_regulator_probe(struct platform_device *pdev) {struct da9063 *da9063 =dev_get_drvdata (pdev->dev.parent);struct da9063_pdata *da9063_pdata =dev_get_platdata (da9063->dev); -struct of_regulator_match *da9063_reg_matches; +struct of_regulator_match *da9063_reg_matches =NULL ;struct da9063_regulators_pdata *regl_pdata;const struct da9063_dev_model *model;struct da9063_regulators *regulators;
Signature · 1 line
1.7.9.5
Quoted 3 lines · Geert Uytterhoeven
If
CONFIG_OF=n:
drivers/regulator/da9063-regulator.c: In function ‘da9063_parse_regulators_dt’:
Applied both, thanks.