From f9503a68fb8a69fb654f79b8f06bd099c478aab2 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 28 May 2014 00:14:36 +0900 Subject: ALSA: firewire-lib: Use ARRAY_SIZE() instead of sizeof() for correct loop limit This commit fixes a big for loop count with array. The limitation of loop count should be calcurated with the number of elements in the array, not with the number of bytes. Aditionally, this commit apply the same declaration as a prototype in header for the array. Signed-off-by: Takashi Sakamoto Signed-off-by: Takashi Iwai --- sound/firewire/amdtp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sound/firewire') diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c index e573f253e39..31dd1cfc79b 100644 --- a/sound/firewire/amdtp.c +++ b/sound/firewire/amdtp.c @@ -107,7 +107,7 @@ const unsigned int amdtp_syt_intervals[CIP_SFC_COUNT] = { }; EXPORT_SYMBOL(amdtp_syt_intervals); -const unsigned int amdtp_rate_table[] = { +const unsigned int amdtp_rate_table[CIP_SFC_COUNT] = { [CIP_SFC_32000] = 32000, [CIP_SFC_44100] = 44100, [CIP_SFC_48000] = 48000, @@ -198,7 +198,7 @@ void amdtp_stream_set_parameters(struct amdtp_stream *s, WARN_ON(midi_channels > AMDTP_MAX_CHANNELS_FOR_MIDI)) return; - for (sfc = 0; sfc < sizeof(amdtp_rate_table); ++sfc) + for (sfc = 0; sfc < ARRAY_SIZE(amdtp_rate_table); ++sfc) if (amdtp_rate_table[sfc] == rate) goto sfc_found; WARN_ON(1); -- cgit v1.2.3-70-g09d2