Skip to content

Commit

Permalink
regulator: tps65917/palmas: Handle possible memory allocation failure
Browse files Browse the repository at this point in the history
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: Nishanth Menon <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
nmenon authored and broonie committed May 6, 2016
1 parent 1b42443 commit 7f091e5
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions drivers/regulator/palmas-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -1467,10 +1467,10 @@ static struct palmas_pmic_driver_data tps65917_ddata = {
.ldo_register = tps65917_ldo_registration,
};

static void palmas_dt_to_pdata(struct device *dev,
struct device_node *node,
struct palmas_pmic_platform_data *pdata,
struct palmas_pmic_driver_data *ddata)
static int palmas_dt_to_pdata(struct device *dev,
struct device_node *node,
struct palmas_pmic_platform_data *pdata,
struct palmas_pmic_driver_data *ddata)
{
struct device_node *regulators;
u32 prop;
Expand All @@ -1479,15 +1479,15 @@ static void palmas_dt_to_pdata(struct device *dev,
regulators = of_get_child_by_name(node, "regulators");
if (!regulators) {
dev_info(dev, "regulator node not found\n");
return;
return 0;
}

ret = of_regulator_match(dev, regulators, ddata->palmas_matches,
ddata->max_reg);
of_node_put(regulators);
if (ret < 0) {
dev_err(dev, "Error parsing regulator init data: %d\n", ret);
return;
return 0;
}

for (idx = 0; idx < ddata->max_reg; idx++) {
Expand All @@ -1500,6 +1500,9 @@ static void palmas_dt_to_pdata(struct device *dev,
continue;

rinit = devm_kzalloc(dev, sizeof(*rinit), GFP_KERNEL);
if (!rinit)
return -ENOMEM;

pdata->reg_data[idx] = match->init_data;
pdata->reg_init[idx] = rinit;

Expand Down Expand Up @@ -1552,6 +1555,8 @@ static void palmas_dt_to_pdata(struct device *dev,
}

pdata->ldo6_vibrator = of_property_read_bool(node, "ti,ldo6-vibrator");

return 0;
}

static const struct of_device_id of_palmas_match_tbl[] = {
Expand Down Expand Up @@ -1633,7 +1638,9 @@ static int palmas_regulators_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, pmic);
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);
if (ret)
Expand Down

0 comments on commit 7f091e5

Please sign in to comment.