diff options
author | Torsten Schenk <torsten.schenk@zoho.com> | 2011-06-16 15:06:27 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-06-16 15:31:33 -0400 |
commit | 0ec5258d68c626922d92e2f0e4e5c689e5360a5d (patch) | |
tree | 0e8a2450585f5602f0b1f1c66131e9830f3fc730 | |
parent | e72888e91cc902ccdc089f237b6eed7587e2b4df (diff) |
ALSA: 6fire - Fix signedness bug
Fixed remaining issues of the signedness bug discovered by Dan Carpenter.
A check was remaining that tests if unsigned rt->rate is >= 0.
Changed that so that rt->rate now consistently uses ARRAY_SIZE(rates)
as invalid rate value and not -1.
Signed-off-by: Torsten Schenk <torsten.schenk@zoho.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/usb/6fire/pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c index b137b25865cc..d144cdb2f159 100644 --- a/sound/usb/6fire/pcm.c +++ b/sound/usb/6fire/pcm.c | |||
@@ -395,12 +395,12 @@ static int usb6fire_pcm_open(struct snd_pcm_substream *alsa_sub) | |||
395 | alsa_rt->hw = pcm_hw; | 395 | alsa_rt->hw = pcm_hw; |
396 | 396 | ||
397 | if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK) { | 397 | if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK) { |
398 | if (rt->rate >= 0) | 398 | if (rt->rate < ARRAY_SIZE(rates)) |
399 | alsa_rt->hw.rates = rates_alsaid[rt->rate]; | 399 | alsa_rt->hw.rates = rates_alsaid[rt->rate]; |
400 | alsa_rt->hw.channels_max = OUT_N_CHANNELS; | 400 | alsa_rt->hw.channels_max = OUT_N_CHANNELS; |
401 | sub = &rt->playback; | 401 | sub = &rt->playback; |
402 | } else if (alsa_sub->stream == SNDRV_PCM_STREAM_CAPTURE) { | 402 | } else if (alsa_sub->stream == SNDRV_PCM_STREAM_CAPTURE) { |
403 | if (rt->rate >= 0) | 403 | if (rt->rate < ARRAY_SIZE(rates)) |
404 | alsa_rt->hw.rates = rates_alsaid[rt->rate]; | 404 | alsa_rt->hw.rates = rates_alsaid[rt->rate]; |
405 | alsa_rt->hw.channels_max = IN_N_CHANNELS; | 405 | alsa_rt->hw.channels_max = IN_N_CHANNELS; |
406 | sub = &rt->capture; | 406 | sub = &rt->capture; |