| Message ID | 20170819202246.18415-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
On 19-08-17, 22:22, Christophe JAILLET wrote: > If 'dev_pm_opp_set_supported_hw()' fails, 'opp_data->opp_node' refcount > will be decremented 2 times. > One, just a few lines above, and another one in the error handling path. > > Fix it by simply moving the 'of_node_put' call of the normal path. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/cpufreq/ti-cpufreq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c > index a7b5658c0460..b29cd3398463 100644 > --- a/drivers/cpufreq/ti-cpufreq.c > +++ b/drivers/cpufreq/ti-cpufreq.c > @@ -245,8 +245,6 @@ static int ti_cpufreq_init(void) > if (ret) > goto fail_put_node; > > - of_node_put(opp_data->opp_node); > - > ret = PTR_ERR_OR_ZERO(dev_pm_opp_set_supported_hw(opp_data->cpu_dev, > version, VERSION_COUNT)); > if (ret) { > @@ -255,6 +253,8 @@ static int ti_cpufreq_init(void) > goto fail_put_node; > } > > + of_node_put(opp_data->opp_node); > + > register_cpufreq_dt: > platform_device_register_simple("cpufreq-dt", -1, NULL, 0); Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On Sunday, August 20, 2017 3:21:06 PM CEST Viresh Kumar wrote: > On 19-08-17, 22:22, Christophe JAILLET wrote: > > If 'dev_pm_opp_set_supported_hw()' fails, 'opp_data->opp_node' refcount > > will be decremented 2 times. > > One, just a few lines above, and another one in the error handling path. > > > > Fix it by simply moving the 'of_node_put' call of the normal path. > > > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > > --- > > drivers/cpufreq/ti-cpufreq.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c > > index a7b5658c0460..b29cd3398463 100644 > > --- a/drivers/cpufreq/ti-cpufreq.c > > +++ b/drivers/cpufreq/ti-cpufreq.c > > @@ -245,8 +245,6 @@ static int ti_cpufreq_init(void) > > if (ret) > > goto fail_put_node; > > > > - of_node_put(opp_data->opp_node); > > - > > ret = PTR_ERR_OR_ZERO(dev_pm_opp_set_supported_hw(opp_data->cpu_dev, > > version, VERSION_COUNT)); > > if (ret) { > > @@ -255,6 +253,8 @@ static int ti_cpufreq_init(void) > > goto fail_put_node; > > } > > > > + of_node_put(opp_data->opp_node); > > + > > register_cpufreq_dt: > > platform_device_register_simple("cpufreq-dt", -1, NULL, 0); > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > > Applied, thanks!
diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c index a7b5658c0460..b29cd3398463 100644 --- a/drivers/cpufreq/ti-cpufreq.c +++ b/drivers/cpufreq/ti-cpufreq.c @@ -245,8 +245,6 @@ static int ti_cpufreq_init(void) if (ret) goto fail_put_node; - of_node_put(opp_data->opp_node); - ret = PTR_ERR_OR_ZERO(dev_pm_opp_set_supported_hw(opp_data->cpu_dev, version, VERSION_COUNT)); if (ret) { @@ -255,6 +253,8 @@ static int ti_cpufreq_init(void) goto fail_put_node; } + of_node_put(opp_data->opp_node); + register_cpufreq_dt: platform_device_register_simple("cpufreq-dt", -1, NULL, 0);
If 'dev_pm_opp_set_supported_hw()' fails, 'opp_data->opp_node' refcount will be decremented 2 times. One, just a few lines above, and another one in the error handling path. Fix it by simply moving the 'of_node_put' call of the normal path. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/cpufreq/ti-cpufreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)