Commit eee22af1 authored Jun 24, 2019 by Takashi Sakamoto Committed by Takashi Iwai Jun 24, 2019

Revert "ALSA: firewire-lib: fix inverted node IDs for amdtp_packet events"



This reverts commit e703965a.

When creating this patch, I compared the value of src field to the
value of first byte of cip_header field (SID) in tracing event.
But in this test I used a device which has a quirk to transfer
isochronous packet with invalid SID. The original change is valid.

Fixes: e703965a ("ALSA: firewire-lib: fix inverted node IDs for amdtp_packet events")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 3f2ce83d

sound/firewire/amdtp-stream-trace.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -35,11 +35,11 @@ TRACE_EVENT(amdtp_packet,
		__entry->cycle = cycles % CYCLES_PER_SECOND;
		__entry->channel = s->context->channel;
		if (s->direction == AMDTP_IN_STREAM) {
		__entry->src = fw_parent_device(s->unit)->card->node_id;
		__entry->dest = fw_parent_device(s->unit)->node_id;
		} else {
		__entry->src = fw_parent_device(s->unit)->node_id;
		__entry->dest = fw_parent_device(s->unit)->card->node_id;
		} else {
		__entry->src = fw_parent_device(s->unit)->card->node_id;
		__entry->dest = fw_parent_device(s->unit)->node_id;
		}
		if (cip_header) {
		memcpy(__get_dynamic_array(cip_header), cip_header,