xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/topic/of' into regulator-next

Browse Source
This commit is contained in:
Mark Brown
2013-02-19 12:42:52 +00:00
parent c99f21c276 86f6673325
commit cf1466fbf8
8 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/regulator/da9052-regulator.c
View File

@@ -366,9 +366,9 @@ static int da9052_regulator_probe(struct platform_device *pdev)
config.init_data = pdata->regulators[pdev->id];
} else {
#ifdef CONFIG_OF
struct device_node *nproot = da9052->dev->of_node;
struct device_node *np;
struct device_node *nproot, *np;
nproot = of_node_get(da9052->dev->of_node);
if (!nproot)
return -ENODEV;
@@ -385,6 +385,7 @@ static int da9052_regulator_probe(struct platform_device *pdev)
break;
}
}
of_node_put(nproot);
#endif
}