]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ARM: AM33xx: fix module_wait_ready without clkctrl register
authorTero Kristo <t-kristo@ti.com>
Thu, 30 Jun 2016 13:15:03 +0000 (16:15 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 4 Jul 2016 14:15:47 +0000 (07:15 -0700)
If the module has no clkctrl register defined, module_wait_ready should
not try to access this. This can potentially cause an illegal register
access, and result in bad idle reporting also.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/cm33xx.c

index 7b181f92952557b777e5e0bbbcedae0c6cb647f8..c073fb57dd13102dfc239c67cd6860fcc281ed2c 100644 (file)
@@ -220,6 +220,9 @@ static int am33xx_cm_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs,
 {
        int i = 0;
 
+       if (!clkctrl_offs)
+               return 0;
+
        omap_test_timeout(_is_module_ready(inst, clkctrl_offs),
                          MAX_MODULE_READY_TIME, i);