summaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2018-12-15 19:03:20 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-09 17:38:37 +0100
commitec7334b5ad18bb01327c957ad25797e5de07885e (patch)
treeaddf2bf08cb356b621da693049fe846eddacfdef /sound/firewire
parent438b26705896e8a540b5f124c2ecd6a71fadf522 (diff)
downloadlinux-stable-ec7334b5ad18bb01327c957ad25797e5de07885e.tar.gz
linux-stable-ec7334b5ad18bb01327c957ad25797e5de07885e.tar.bz2
linux-stable-ec7334b5ad18bb01327c957ad25797e5de07885e.zip
ALSA: firewire-lib: fix wrong assignment for 'out_packet_without_header' tracepoint
commit aa9a9e39b4f65733bf19d90cbd026e85a74efb99 upstream. An initial commit to add tracepoints for packets without CIP headers introduces a wrong assignment to 'data_blocks' value of 'out_packet_without_header' tracepoint. This commit fixes the bug. Cc: <stable@vger.kernel.org> # v4.12+ Fixes: b164d2fd6e49 ('ALSA: firewire_lib: add tracepoints for packets without CIP headers') Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/amdtp-stream-trace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h
index 54cdd4ffa9ce..c05b3da0aa1c 100644
--- a/sound/firewire/amdtp-stream-trace.h
+++ b/sound/firewire/amdtp-stream-trace.h
@@ -169,7 +169,7 @@ TRACE_EVENT(out_packet_without_header,
__entry->dest = fw_parent_device(s->unit)->node_id;
__entry->payload_quadlets = payload_length / 4;
__entry->data_blocks = data_blocks,
- __entry->data_blocks = s->data_block_counter,
+ __entry->data_block_counter = s->data_block_counter,
__entry->packet_index = s->packet_index;
__entry->irq = !!in_interrupt();
__entry->index = index;