Commit 7f091e53 authored by Nishanth Menon's avatar Nishanth Menon Committed by Mark Brown

regulator: tps65917/palmas: Handle possible memory allocation failure

Stop the palmas regulator driver from imagining that the allocations
will always succeed. Since regulator dt nodes are optional in nature and
can be described in downstream drivers via platform data, continue to
maintain code flow as prior when of node is not found.
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1b42443d
...@@ -1467,10 +1467,10 @@ static struct palmas_pmic_driver_data tps65917_ddata = { ...@@ -1467,10 +1467,10 @@ static struct palmas_pmic_driver_data tps65917_ddata = {
.ldo_register = tps65917_ldo_registration, .ldo_register = tps65917_ldo_registration,
}; };
static void palmas_dt_to_pdata(struct device *dev, static int palmas_dt_to_pdata(struct device *dev,
struct device_node *node, struct device_node *node,
struct palmas_pmic_platform_data *pdata, struct palmas_pmic_platform_data *pdata,
struct palmas_pmic_driver_data *ddata) struct palmas_pmic_driver_data *ddata)
{ {
struct device_node *regulators; struct device_node *regulators;
u32 prop; u32 prop;
...@@ -1479,7 +1479,7 @@ static void palmas_dt_to_pdata(struct device *dev, ...@@ -1479,7 +1479,7 @@ static void palmas_dt_to_pdata(struct device *dev,
regulators = of_get_child_by_name(node, "regulators"); regulators = of_get_child_by_name(node, "regulators");
if (!regulators) { if (!regulators) {
dev_info(dev, "regulator node not found\n"); dev_info(dev, "regulator node not found\n");
return; return 0;
} }
ret = of_regulator_match(dev, regulators, ddata->palmas_matches, ret = of_regulator_match(dev, regulators, ddata->palmas_matches,
...@@ -1487,7 +1487,7 @@ static void palmas_dt_to_pdata(struct device *dev, ...@@ -1487,7 +1487,7 @@ static void palmas_dt_to_pdata(struct device *dev,
of_node_put(regulators); of_node_put(regulators);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Error parsing regulator init data: %d\n", ret); dev_err(dev, "Error parsing regulator init data: %d\n", ret);
return; return 0;
} }
for (idx = 0; idx < ddata->max_reg; idx++) { for (idx = 0; idx < ddata->max_reg; idx++) {
...@@ -1500,6 +1500,9 @@ static void palmas_dt_to_pdata(struct device *dev, ...@@ -1500,6 +1500,9 @@ static void palmas_dt_to_pdata(struct device *dev,
continue; continue;
rinit = devm_kzalloc(dev, sizeof(*rinit), GFP_KERNEL); rinit = devm_kzalloc(dev, sizeof(*rinit), GFP_KERNEL);
if (!rinit)
return -ENOMEM;
pdata->reg_data[idx] = match->init_data; pdata->reg_data[idx] = match->init_data;
pdata->reg_init[idx] = rinit; pdata->reg_init[idx] = rinit;
...@@ -1552,6 +1555,8 @@ static void palmas_dt_to_pdata(struct device *dev, ...@@ -1552,6 +1555,8 @@ static void palmas_dt_to_pdata(struct device *dev,
} }
pdata->ldo6_vibrator = of_property_read_bool(node, "ti,ldo6-vibrator"); pdata->ldo6_vibrator = of_property_read_bool(node, "ti,ldo6-vibrator");
return 0;
} }
static const struct of_device_id of_palmas_match_tbl[] = { static const struct of_device_id of_palmas_match_tbl[] = {
...@@ -1633,7 +1638,9 @@ static int palmas_regulators_probe(struct platform_device *pdev) ...@@ -1633,7 +1638,9 @@ static int palmas_regulators_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, pmic); platform_set_drvdata(pdev, pmic);
pmic->palmas->pmic_ddata = driver_data; pmic->palmas->pmic_ddata = driver_data;
palmas_dt_to_pdata(&pdev->dev, node, pdata, driver_data); ret = palmas_dt_to_pdata(&pdev->dev, node, pdata, driver_data);
if (ret)
return ret;
ret = palmas_smps_read(palmas, PALMAS_SMPS_CTRL, &reg); ret = palmas_smps_read(palmas, PALMAS_SMPS_CTRL, &reg);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment