summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-05-04 16:06:58 +0200
committerTakashi Iwai <tiwai@suse.de>2009-05-04 16:06:58 +0200
commit5d7ee52f1c3dbe0e06d9bfad4912562fd1b6eb03 (patch)
treea7c9171b0c8a0cecbd54c0349673574d13bac9d9 /sound
parentdea6a9d306f75004c202a843e5a578e595e56c09 (diff)
parent3f68165e234233255a789c827c5d3d6fa965ddce (diff)
downloadlinux-3.10-5d7ee52f1c3dbe0e06d9bfad4912562fd1b6eb03.tar.gz
linux-3.10-5d7ee52f1c3dbe0e06d9bfad4912562fd1b6eb03.tar.bz2
linux-3.10-5d7ee52f1c3dbe0e06d9bfad4912562fd1b6eb03.zip
Merge branch 'fix/misc' into for-linus
* fix/misc: ALSA: indigo-express: add missing 64KHz flags
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/echoaudio/indigodjx.c1
-rw-r--r--sound/pci/echoaudio/indigoiox.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c
index 3482ef69f49..2e44316530a 100644
--- a/sound/pci/echoaudio/indigodjx.c
+++ b/sound/pci/echoaudio/indigodjx.c
@@ -88,6 +88,7 @@ static struct snd_pcm_hardware pcm_hardware_skel = {
.rates = SNDRV_PCM_RATE_32000 |
SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_48000 |
+ SNDRV_PCM_RATE_64000 |
SNDRV_PCM_RATE_88200 |
SNDRV_PCM_RATE_96000,
.rate_min = 32000,
diff --git a/sound/pci/echoaudio/indigoiox.c b/sound/pci/echoaudio/indigoiox.c
index aebee27a40f..eb3819f9654 100644
--- a/sound/pci/echoaudio/indigoiox.c
+++ b/sound/pci/echoaudio/indigoiox.c
@@ -89,6 +89,7 @@ static struct snd_pcm_hardware pcm_hardware_skel = {
.rates = SNDRV_PCM_RATE_32000 |
SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_48000 |
+ SNDRV_PCM_RATE_64000 |
SNDRV_PCM_RATE_88200 |
SNDRV_PCM_RATE_96000,
.rate_min = 32000,