Up till this commit passing NULL as input parameter was allowed, but not
handled properly. When a NULL parameter was passed to the function a data
abort was raised.

Signed-off-by: Dario Binacchi <dario...@libero.it>
---

 arch/arm/mach-omap2/am33xx/clock.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/am33xx/clock.c 
b/arch/arm/mach-omap2/am33xx/clock.c
index 8819062aaa..130ee6c6e3 100644
--- a/arch/arm/mach-omap2/am33xx/clock.c
+++ b/arch/arm/mach-omap2/am33xx/clock.c
@@ -194,13 +194,14 @@ void do_enable_clocks(u32 *const *clk_domains,
        u32 i, max = 100;
 
        /* Put the clock domains in SW_WKUP mode */
-       for (i = 0; (i < max) && clk_domains[i]; i++) {
+       for (i = 0; (i < max) && clk_domains && clk_domains[i]; i++) {
                enable_clock_domain(clk_domains[i],
                                    CD_CLKCTRL_CLKTRCTRL_SW_WKUP);
        }
 
        /* Clock modules that need to be put in SW_EXPLICIT_EN mode */
-       for (i = 0; (i < max) && clk_modules_explicit_en[i]; i++) {
+       for (i = 0; (i < max) && clk_modules_explicit_en &&
+            clk_modules_explicit_en[i]; i++) {
                enable_clock_module(clk_modules_explicit_en[i],
                                    MODULE_CLKCTRL_MODULEMODE_SW_EXPLICIT_EN,
                                    wait_for_enable);
@@ -215,12 +216,13 @@ void do_disable_clocks(u32 *const *clk_domains,
 
 
        /* Clock modules that need to be put in SW_DISABLE */
-       for (i = 0; (i < max) && clk_modules_disable[i]; i++)
+       for (i = 0; (i < max) && clk_modules_disable && clk_modules_disable[i];
+            i++)
                disable_clock_module(clk_modules_disable[i],
                                     wait_for_disable);
 
        /* Put the clock domains in SW_SLEEP mode */
-       for (i = 0; (i < max) && clk_domains[i]; i++)
+       for (i = 0; (i < max) && clk_domains && clk_domains[i]; i++)
                disable_clock_domain(clk_domains[i]);
 }
 
-- 
2.17.1

Reply via email to