diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2020-05-28 10:08:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2020-05-28 10:08:50 +0200 |
| commit | 6d2848402619f33895e419430ad43a223c4866fc (patch) | |
| tree | a88115a04139f68e5240dfdf40e11c752a3e73a5 /sound/firewire | |
| parent | ALSA: firewire-motu: add support for MOTU UltraLite-mk3 (FireWire only model) (diff) | |
| parent | ALSA: hda/realtek - Add new codec supported for ALC287 (diff) | |
| download | linux-6d2848402619f33895e419430ad43a223c4866fc.tar.gz linux-6d2848402619f33895e419430ad43a223c4866fc.tar.bz2 linux-6d2848402619f33895e419430ad43a223c4866fc.zip | |
Merge branch 'for-linus' into for-next
Back-merge 5.7-devel branch for further development.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/amdtp-stream-trace.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h index 16c7f6605511..26e7cb555d3c 100644 --- a/sound/firewire/amdtp-stream-trace.h +++ b/sound/firewire/amdtp-stream-trace.h @@ -66,8 +66,7 @@ TRACE_EVENT(amdtp_packet, __entry->irq, __entry->index, __print_array(__get_dynamic_array(cip_header), - __get_dynamic_array_len(cip_header), - sizeof(u8))) + __get_dynamic_array_len(cip_header), 1)) ); #endif |