diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:17 +0100 |
| commit | f27a5fb424d4897edd3c7735ecf054ee57a5dbd0 (patch) | |
| tree | a6bc4d322341ee1211657302f41614b52572b207 /drivers/cpufreq | |
| parent | 6979380d85fd9e1ff701021206b315fcd66b510e (diff) | |
| parent | 9efdd27678ef5e22c27c230a08a211b702768f3a (diff) | |
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq-cpu0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index ad1fde27766..e9dedb27dec 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c @@ -197,7 +197,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) cpu_dev = &pdev->dev; cpu_dev->of_node = np; - cpu_reg = devm_regulator_get(cpu_dev, "cpu0"); + cpu_reg = devm_regulator_get_optional(cpu_dev, "cpu0"); if (IS_ERR(cpu_reg)) { /* * If cpu0 regulator supply node is present, but regulator is |