Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37bd6ca8 authored by Afzal Mohammed's avatar Afzal Mohammed Committed by Tony Lindgren
Browse files

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: default avatarAfzal Mohammed <afzal@ti.com>
Acked-by: default avatarJon Hunter <jgchunter@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ddcf6600

arch/arm/mach-omap2/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -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;