diff options
| author | Cai Li <cai.li@spreadtrum.com> | 2017-11-21 17:24:38 +0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-12-05 15:28:51 -0800 |
| commit | 975b820b6836b6b6c42fb84cd2e772e2b41bca67 (patch) | |
| tree | be5a439036e60b2b6a66620ba34c2e35d7a223d9 /include/trace/events/clk.h | |
| parent | 588fb54b0cc5be5fd2e12bb04810534ffc3d49cc (diff) | |
| download | talos-obmc-linux-975b820b6836b6b6c42fb84cd2e772e2b41bca67.tar.gz talos-obmc-linux-975b820b6836b6b6c42fb84cd2e772e2b41bca67.zip | |
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: dfc202ead312 (clk: Add tracepoints for hardware operations)
Signed-off-by: Cai Li <cai.li@spreadtrum.com>
Signed-off-by: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'include/trace/events/clk.h')
| -rw-r--r-- | include/trace/events/clk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/events/clk.h b/include/trace/events/clk.h index 758607226bfd..2cd449328aee 100644 --- a/include/trace/events/clk.h +++ b/include/trace/events/clk.h @@ -134,12 +134,12 @@ DECLARE_EVENT_CLASS(clk_parent, TP_STRUCT__entry( __string( name, core->name ) - __string( pname, parent->name ) + __string( pname, parent ? parent->name : "none" ) ), TP_fast_assign( __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)) |
