diff options
| author | Takashi Iwai | 2010-01-19 15:53:43 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2010-01-19 15:53:43 +0100 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /sound/core | |
| parent | ALSA: hda_intel: ALSA HD Audio patch for Intel Cougar Point DeviceIDs (diff) | |
| parent | ALSA: hda - Turn on EAPD only if available for Realtek codecs (diff) | |
| download | kernel-qcow2-linux-9e4c84967ef027fe50a03cf48dd6da9519c8e60c.tar.gz kernel-qcow2-linux-9e4c84967ef027fe50a03cf48dd6da9519c8e60c.tar.xz kernel-qcow2-linux-9e4c84967ef027fe50a03cf48dd6da9519c8e60c.zip | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/core')
| -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 27284f628361..a870fe696578 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1918,13 +1918,13 @@ int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream) err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE, hw->rate_min, hw->rate_max); - if (err < 0) - return err; + if (err < 0) + return err; err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, hw->period_bytes_min, hw->period_bytes_max); - if (err < 0) - return err; + if (err < 0) + return err; err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIODS, hw->periods_min, hw->periods_max); |