summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAfzal Mohammed <afzal@ti.com>2013-05-28 11:54:48 +0530
committerTony Lindgren <tony@atomide.com>2013-07-04 04:24:42 -0700
commit37bd6ca8ab6c103603e04e320d3debeb4596e481 (patch)
tree17702135c93bfdda942260a5837c35f1c4d45276 /arch/arm
parentddcf6600b133697adbafd96e080818bdc0dfd028 (diff)
downloadop-kernel-dev-37bd6ca8ab6c103603e04e320d3debeb4596e481.zip
op-kernel-dev-37bd6ca8ab6c103603e04e320d3debeb4596e481.tar.gz
ARM: OMAP2+: timer: initialize before using oh_name
of_property_read_string_index(...,&oh_name) in omap_dm_timer_init_one does not alter the value of 'oh_name' even if the relevant function fails and as 'oh_name' in stack may have a non-zero value, it would be misunderstood by timer code that DT has specified "ti,hwmod" property for timer. 'oh_name' in this scenario would be a junk value, this would result in module not being enabled by hwmod API's for timer, and in turn crash. Signed-off-by: Afzal Mohammed <afzal@ti.com> Acked-by: Jon Hunter <jgchunter@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 3bdb0fb..5f148e7 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -220,7 +220,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
int posted)
{
char name[10]; /* 10 = sizeof("gptXX_Xck0") */
- const char *oh_name;
+ const char *oh_name = NULL;
struct device_node *np;
struct omap_hwmod *oh;
struct resource irq, mem;
OpenPOWER on IntegriCloud