diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-17 08:54:47 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-17 08:54:47 -0400 |
| commit | 3409fcd1f71d02025e3f179127a8ba243c525d78 (patch) | |
| tree | 365b2e3f8901c358f6ea216c2ba03e7a1f48a359 /sound/usb | |
| parent | f4b1e98aa93d548e5d51c8c5272ea08562fc71c1 (diff) | |
| parent | ad2409413d09fca763be1ac5161f2a9d82367903 (diff) | |
Merge branch 'fix/hda' into topic/misc
Diffstat (limited to 'sound/usb')
| -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; |