[PATCH mvebu v3 07/10] cpufreq: armada-37xx: Fix driver cleanup when registration failed

Gregory CLEMENT gregory.clement at bootlin.com
Mon Mar 29 15:58:11 BST 2021


Pali Rohár <pali at kernel.org> writes:

> Commit 8db82563451f ("cpufreq: armada-37xx: fix frequency calculation for
> opp") changed calculation of frequency passed to the dev_pm_opp_add()
> function call. But the code for dev_pm_opp_remove() function call was not
> updated, so the driver cleanup phase does not work when registration fails.
>
> This fixes the issue by using the same frequency in both calls.
>
> Signed-off-by: Pali Rohár <pali at kernel.org>
> Tested-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
> Tested-by: Anders Trier Olesen <anders.trier.olesen at gmail.com>
> Tested-by: Philip Soares <philips at netisense.com>
> Fixes: 8db82563451f ("cpufreq: armada-37xx: fix frequency calculation for opp")
> Cc: stable at vger.kernel.org

Acked-by: Gregory CLEMENT <gregory.clement at bootlin.com>

Thanks,

Gregory
> ---
>  drivers/cpufreq/armada-37xx-cpufreq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c
> index c7683d447b11..1ab2113daef5 100644
> --- a/drivers/cpufreq/armada-37xx-cpufreq.c
> +++ b/drivers/cpufreq/armada-37xx-cpufreq.c
> @@ -521,7 +521,7 @@ static int __init armada37xx_cpufreq_driver_init(void)
>  remove_opp:
>  	/* clean-up the already added opp before leaving */
>  	while (load_lvl-- > ARMADA_37XX_DVFS_LOAD_0) {
> -		freq = cur_frequency / dvfs->divider[load_lvl];
> +		freq = base_frequency / dvfs->divider[load_lvl];
>  		dev_pm_opp_remove(cpu_dev, freq);
>  	}
>  
> -- 
> 2.20.1
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com



More information about the linux-arm-kernel mailing list