ASoC: ak4458: rstn_control - return a non-zero on error only

[platform/kernel/linux-rpi.git] / sound / firewire / amdtp-stream.c

diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index cb9acfe..293933f 100644 (file)
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -629,15 +629,17 @@ end:
 }
 
 static int handle_in_packet_without_header(struct amdtp_stream *s,
-                       unsigned int payload_quadlets, unsigned int cycle,
+                       unsigned int payload_length, unsigned int cycle,
                        unsigned int index)
 {
        __be32 *buffer;
+       unsigned int payload_quadlets;
        unsigned int data_blocks;
        struct snd_pcm_substream *pcm;
        unsigned int pcm_frames;
 
        buffer = s->buffer.packets[s->packet_index].buffer;
+       payload_quadlets = payload_length / 4;
        data_blocks = payload_quadlets / s->data_block_quadlets;
 
        trace_in_packet_without_header(s, cycle, payload_quadlets, data_blocks,