diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:15 +0100 |
| commit | a1cb98ac8b6980fcd530271c739c3dd7436a91aa (patch) | |
| tree | 02a084f7ccb9d80c60a99c15d66800154fed146e /include/trace | |
| parent | 7c0815289113167bee2da337afa6b34e3077e4f5 (diff) | |
| parent | 0f2780ad4c2a398528c7bb1572158d6e894e5dd2 (diff) | |
| download | op-kernel-dev-a1cb98ac8b6980fcd530271c739c3dd7436a91aa.zip op-kernel-dev-a1cb98ac8b6980fcd530271c739c3dd7436a91aa.tar.gz | |
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/asoc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index c75c795..0194a64 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h @@ -296,17 +296,17 @@ TRACE_EVENT(snd_soc_cache_sync, TP_ARGS(codec, type, status), TP_STRUCT__entry( - __string( name, codec->name ) + __string( name, codec->component.name) __string( status, status ) __string( type, type ) __field( int, id ) ), TP_fast_assign( - __assign_str(name, codec->name); + __assign_str(name, codec->component.name); __assign_str(status, status); __assign_str(type, type); - __entry->id = codec->id; + __entry->id = codec->component.id; ), TP_printk("codec=%s.%d type=%s status=%s", __get_str(name), |
