aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-05-27 11:14:36 -0400
committerTakashi Iwai <tiwai@suse.de>2014-05-27 11:34:27 -0400
commitf9503a68fb8a69fb654f79b8f06bd099c478aab2 (patch)
tree973497090eeec0ad42e8062f47cda1db0b23bb7f /sound/firewire
parent9b1ee0b2cb8bffdbb3003b1d5205f3ae0592c15a (diff)
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 <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/amdtp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
index e573f253e39d..31dd1cfc79b3 100644
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp.c
@@ -107,7 +107,7 @@ const unsigned int amdtp_syt_intervals[CIP_SFC_COUNT] = {
107}; 107};
108EXPORT_SYMBOL(amdtp_syt_intervals); 108EXPORT_SYMBOL(amdtp_syt_intervals);
109 109
110const unsigned int amdtp_rate_table[] = { 110const unsigned int amdtp_rate_table[CIP_SFC_COUNT] = {
111 [CIP_SFC_32000] = 32000, 111 [CIP_SFC_32000] = 32000,
112 [CIP_SFC_44100] = 44100, 112 [CIP_SFC_44100] = 44100,
113 [CIP_SFC_48000] = 48000, 113 [CIP_SFC_48000] = 48000,
@@ -198,7 +198,7 @@ void amdtp_stream_set_parameters(struct amdtp_stream *s,
198 WARN_ON(midi_channels > AMDTP_MAX_CHANNELS_FOR_MIDI)) 198 WARN_ON(midi_channels > AMDTP_MAX_CHANNELS_FOR_MIDI))
199 return; 199 return;
200 200
201 for (sfc = 0; sfc < sizeof(amdtp_rate_table); ++sfc) 201 for (sfc = 0; sfc < ARRAY_SIZE(amdtp_rate_table); ++sfc)
202 if (amdtp_rate_table[sfc] == rate) 202 if (amdtp_rate_table[sfc] == rate)
203 goto sfc_found; 203 goto sfc_found;
204 WARN_ON(1); 204 WARN_ON(1);