]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ALSA: firewire-lib: use clear name for variable of CIP header
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Wed, 22 May 2019 14:17:03 +0000 (23:17 +0900)
committerTakashi Iwai <tiwai@suse.de>
Thu, 23 May 2019 10:19:38 +0000 (12:19 +0200)
This commit is to distinguish variable of CIP header from variable of
isochronous context header.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/amdtp-stream.c

index f43943fd962dfa5806df70584f28c9f40b8a4890..020edf2b172666b8ece1f355b5425ba7493f519c 100644 (file)
@@ -286,15 +286,15 @@ EXPORT_SYMBOL(amdtp_stream_set_parameters);
 unsigned int amdtp_stream_get_max_payload(struct amdtp_stream *s)
 {
        unsigned int multiplier = 1;
-       unsigned int header_size = 0;
+       unsigned int cip_header_size = 0;
 
        if (s->flags & CIP_JUMBO_PAYLOAD)
                multiplier = 5;
        if (!(s->flags & CIP_NO_HEADER))
-               header_size = 8;
+               cip_header_size = sizeof(__be32) * 2;
 
-       return header_size +
-               s->syt_interval * s->data_block_quadlets * 4 * multiplier;
+       return cip_header_size +
+               s->syt_interval * s->data_block_quadlets * sizeof(__be32) * multiplier;
 }
 EXPORT_SYMBOL(amdtp_stream_get_max_payload);