This is a note to let you know that I've just added the patch titled

    PM / OPP: fix incorrect OPP count handling in of_init_opp_table

to the 3.15-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     pm-opp-fix-incorrect-opp-count-handling-in-of_init_opp_table.patch
and it can be found in the queue-3.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 086abb58590a4df73e8a6ed71fd418826937cd46 Mon Sep 17 00:00:00 2001
From: Chander Kashyap <[email protected]>
Date: Fri, 16 May 2014 16:21:17 +0530
Subject: PM / OPP: fix incorrect OPP count handling in of_init_opp_table

From: Chander Kashyap <[email protected]>

commit 086abb58590a4df73e8a6ed71fd418826937cd46 upstream.

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 <[email protected]>
Signed-off-by: Inderpal Singh <[email protected]>
Acked-by: Viresh Kumar <[email protected]>
Acked-by: Nishanth Menon <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/base/power/opp.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -734,11 +734,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;
        }
 


Patches currently in stable-queue which might be from 
[email protected] are

queue-3.15/pm-opp-fix-incorrect-opp-count-handling-in-of_init_opp_table.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to