commit db6a5d728068ed544275d2ec6a21930944abfe66
author Simon Horman <horms+renesas@verge.net.au> Tue Jul 29 14:10:44 2014 +0900
committer Simon Horman <horms+renesas@verge.net.au> Tue Jul 29 14:10:44 2014 +0900
tree 0cb7a5380aed1d8ead148995b6fb71f8b81a3f19
parent 07afbd2aa4305fdd763774b5ddbba96330d4b791
parent 2f3a8265168accf0a814375cf3b94eeade3bb1c0

Merge branch 'backport/v3.10.28-ltsi-rc1/power-fixes' into backport/v3.10.31-ltsi/snapshot-merge

drivers/base/power/opp.c

diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index c8ec186..a5d4de1 100644
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -731,11 +731,9 @@
 		unsigned long freq = be32_to_cpup(val++) * 1000;
 		unsigned long volt = be32_to_cpup(val++);
 
-		if (opp_add(dev, freq, volt)) {
+		if (opp_add(dev, freq, volt))
 			dev_warn(dev, "%s: Failed to add OPP %ld\n",
 				 __func__, freq);
-			continue;
-		}
 		nr -= 2;
 	}