|
@@ -964,8 +964,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
|
|
|
{
|
|
|
struct tps65910_board *pmic_plat_data;
|
|
|
struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
|
|
|
- struct device_node *np = pdev->dev.parent->of_node;
|
|
|
- struct device_node *regulators;
|
|
|
+ struct device_node *np, *regulators;
|
|
|
struct of_regulator_match *matches;
|
|
|
unsigned int prop;
|
|
|
int idx = 0, ret, count;
|
|
@@ -978,6 +977,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
+ np = of_node_get(pdev->dev.parent->of_node);
|
|
|
regulators = of_find_node_by_name(np, "regulators");
|
|
|
if (!regulators) {
|
|
|
dev_err(&pdev->dev, "regulator node not found\n");
|
|
@@ -994,11 +994,13 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
|
|
|
matches = tps65911_matches;
|
|
|
break;
|
|
|
default:
|
|
|
+ of_node_put(regulators);
|
|
|
dev_err(&pdev->dev, "Invalid tps chip version\n");
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
ret = of_regulator_match(&pdev->dev, regulators, matches, count);
|
|
|
+ of_node_put(regulators);
|
|
|
if (ret < 0) {
|
|
|
dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",
|
|
|
ret);
|