Re: [PATCH] PM / OPP: fix incorrect OPP count handling in of_init_opp_table

From: Nishanth Menon
Date: Mon May 19 2014 - 09:04:37 EST


On Fri, May 16, 2014 at 5:51 AM, Chander Kashyap
<chander.kashyap@xxxxxxxxxx> wrote:
> In of_init_opp_table function, if a failure to add an OPP is
> detected, the count of OPPs, yet to be added is not updated.
> Fix this by decrementing this count on failure as well.
>
> Signed-off-by: Chander Kashyap <k.chander@xxxxxxxxxxx>
> Signed-off-by: Inderpal Singh <inderpal.s@xxxxxxxxxxx>
> ---
> drivers/base/power/opp.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
> index d9e376a..faae9cf 100644
> --- a/drivers/base/power/opp.c
> +++ b/drivers/base/power/opp.c
> @@ -643,11 +643,9 @@ int of_init_opp_table(struct device *dev)
> unsigned long freq = be32_to_cpup(val++) * 1000;
> unsigned long volt = be32_to_cpup(val++);
>
> - if (dev_pm_opp_add(dev, freq, volt)) {
> + if (dev_pm_opp_add(dev, freq, volt))
> dev_warn(dev, "%s: Failed to add OPP %ld\n",
> __func__, freq);
> - continue;
> - }
> nr -= 2;
> }
Good Catch. Thanks.

Acked-by: Nishanth Menon <nm@xxxxxx>

--
Regards,
Nishanth Menon
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/