On Friday, August 09, 2013 07:08:03 PM Mark Brown wrote:
> From: Mark Brown <broonie@xxxxxxxxxx>
>
> Since the cpufreq-cpu0 driver is capable of coping without a software
> controllable regulator and would be confused by a dummy one it should
> use devm_regulator_get_optional() to ensure no dummy is provided.
>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
> ---
>
> devm_regulator_get_optional() is a new API in my tree for -next, is it
> OK to merge this patch via that branch?
Sure, please go ahead.
Thanks,
Rafael
> drivers/cpufreq/cpufreq-cpu0.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
> index 09cd3a7..b946ac7 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
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe cpufreq" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
