diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 05:19:18 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 05:19:18 -0500 |
| commit | ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0 (patch) | |
| tree | d83637979db83bb9d5a23e190148b90b60c976d2 /sound/core/pcm_native.c | |
| parent | d39e82db73eb876c60d00f00219d767b3be30307 (diff) | |
| parent | f167e1d073278fe231bbdd5d6c24fb9d091aa544 (diff) | |
Merge branch 'fixes' into devel
Diffstat (limited to 'sound/core/pcm_native.c')
| -rw-r--r-- | sound/core/pcm_native.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 9cbaf90d3d8..053c6d612a2 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
| @@ -1956,13 +1956,13 @@ int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream) | |||
| 1956 | 1956 | ||
| 1957 | err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE, | 1957 | err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE, |
| 1958 | hw->rate_min, hw->rate_max); | 1958 | hw->rate_min, hw->rate_max); |
| 1959 | if (err < 0) | 1959 | if (err < 0) |
| 1960 | return err; | 1960 | return err; |
| 1961 | 1961 | ||
| 1962 | err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, | 1962 | err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, |
| 1963 | hw->period_bytes_min, hw->period_bytes_max); | 1963 | hw->period_bytes_min, hw->period_bytes_max); |
| 1964 | if (err < 0) | 1964 | if (err < 0) |
| 1965 | return err; | 1965 | return err; |
| 1966 | 1966 | ||
| 1967 | err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIODS, | 1967 | err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIODS, |
| 1968 | hw->periods_min, hw->periods_max); | 1968 | hw->periods_min, hw->periods_max); |