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

Commit 975b820b authored by Cai Li's avatar Cai Li Committed by Stephen Boyd
Browse files

clk: fix a panic error caused by accessing NULL pointer 



In some cases the clock parent would be set NULL when doing re-parent,
it will cause a NULL pointer accessing if clk_set trace event is
enabled.

This patch sets the parent as "none" if the input parameter is NULL.

Fixes: dfc202ea (clk: Add tracepoints for hardware operations)
Signed-off-by: default avatarCai Li <cai.li@spreadtrum.com>
Signed-off-by: default avatarChunyan Zhang <chunyan.zhang@spreadtrum.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 588fb54b

include/trace/events/clk.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -134,12 +134,12 @@ DECLARE_EVENT_CLASS(clk_parent, 




	TP_STRUCT__entry(

	TP_STRUCT__entry(

		__string(        name,           core->name                )

		__string(        name,           core->name                )

		__string(        pname,          parent->name              )

		__string(        pname, parent ? parent->name : "none"     )

	),

	),





	TP_fast_assign(

	TP_fast_assign(

		__assign_str(name, core->name);

		__assign_str(name, core->name);

		__assign_str(pname, parent->name);

		__assign_str(pname, parent ? parent->name : "none");

	),

	),





	TP_printk("%s %s", __get_str(name), __get_str(pname))

	TP_printk("%s %s", __get_str(name), __get_str(pname))