diff options
author | Nishanth Menon <nm@ti.com> | 2012-05-18 13:26:19 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2012-06-19 18:23:29 -0400 |
commit | b110547e586eb5825bc1d04aa9147bff83b57672 (patch) | |
tree | 6547f2dea4af3251a647e391a3eeac65f54ecdd3 /arch/arm/mach-omap2/opp.c | |
parent | 164e0cbf608214bddc4d28e2777f49e7b3a0f65c (diff) |
ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one
Commit 9fa2df6b90786301b175e264f5fa9846aba81a65
(ARM: OMAP2+: OPP: allow OPP enumeration to continue if device is not present)
makes the logic:
for (i = 0; i < opp_def_size; i++) {
<snip>
if (!oh || !oh->od) {
<snip>
continue;
}
<snip>
opp_def++;
}
In short, the moment we hit a "Bad OPP", we end up looping the list
comparing against the bad opp definition pointer for the rest of the
iteration count. Instead, increment opp_def in the for loop itself
and allow continue to be used in code without much thought so that
we check the next set of OPP definition pointers :)
Cc: Steve Sakoman <steve@sakoman.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: stable@vger.kernel.org
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/opp.c')
-rw-r--r-- | arch/arm/mach-omap2/opp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c index de6d46451746..d8f6dbf45d16 100644 --- a/arch/arm/mach-omap2/opp.c +++ b/arch/arm/mach-omap2/opp.c | |||
@@ -53,7 +53,7 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def, | |||
53 | omap_table_init = 1; | 53 | omap_table_init = 1; |
54 | 54 | ||
55 | /* Lets now register with OPP library */ | 55 | /* Lets now register with OPP library */ |
56 | for (i = 0; i < opp_def_size; i++) { | 56 | for (i = 0; i < opp_def_size; i++, opp_def++) { |
57 | struct omap_hwmod *oh; | 57 | struct omap_hwmod *oh; |
58 | struct device *dev; | 58 | struct device *dev; |
59 | 59 | ||
@@ -86,7 +86,6 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def, | |||
86 | __func__, opp_def->freq, | 86 | __func__, opp_def->freq, |
87 | opp_def->hwmod_name, i, r); | 87 | opp_def->hwmod_name, i, r); |
88 | } | 88 | } |
89 | opp_def++; | ||
90 | } | 89 | } |
91 | 90 | ||
92 | return 0; | 91 | return 0; |