lkml.org 
[lkml]   [2019]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 046/101] ALSA: firewire-lib: fix wrong assignment for out_packet_without_header tracepoint
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

    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>

    ---
    sound/firewire/amdtp-stream-trace.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- 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;

    \
     
     \ /
      Last update: 2019-01-07 18:24    [W:3.536 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site