aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2018-08-08 04:07:03 -0400
committerTony Lindgren <tony@atomide.com>2018-08-17 10:22:27 -0400
commit4769c003e0fcff0ee001a9102e2605bdaa5880f0 (patch)
tree0fe459fbbefc679a560ad90c8df8b4a8a27b8fbc
parent94710cac0ef4ee177a63b5227664b38c95bbf703 (diff)
ARM: OMAP2+: Fix null hwmod for ti-sysc debug
We may call omap_hwmod_parse_module_range() with no hwmod allocated yet and may have debug enabled. Let's fix this by checking for hwmod before trying to use it's name. Fixes: 6c72b3550672 ("ARM: OMAP2+: Parse module IO range from dts for legacy Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 2ceffd85dd3d..7f759abcf49c 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2220,7 +2220,7 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh,
2220 size = be32_to_cpup(ranges); 2220 size = be32_to_cpup(ranges);
2221 2221
2222 pr_debug("omap_hwmod: %s %s at 0x%llx size 0x%llx\n", 2222 pr_debug("omap_hwmod: %s %s at 0x%llx size 0x%llx\n",
2223 oh->name, np->name, base, size); 2223 oh ? oh->name : "", np->name, base, size);
2224 2224
2225 res->start = base; 2225 res->start = base;
2226 res->end = base + size - 1; 2226 res->end = base + size - 1;