diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-06-24 11:20:15 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-06-24 12:10:41 +0200 |
| commit | eee22af1eddedf2a140fcf6855564420abed818d (patch) | |
| tree | d0639cbabd1a0ebaedf21a5fa52c4ab26c6f7443 /sound | |
| parent | ALSA: oxfw: ensure to release isochronous resources in pcm.hw_params callback (diff) | |
| download | linux-eee22af1eddedf2a140fcf6855564420abed818d.tar.xz linux-eee22af1eddedf2a140fcf6855564420abed818d.zip | |
Revert "ALSA: firewire-lib: fix inverted node IDs for amdtp_packet events"
This reverts commit e703965a129cdd72ff74e248f8fbf0d617844527.
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: e703965a129c ("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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/firewire/amdtp-stream-trace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h index 5fe0920f04e5..ab708857979f 100644 --- a/sound/firewire/amdtp-stream-trace.h +++ b/sound/firewire/amdtp-stream-trace.h @@ -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, |