summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRaymond Yau <superquad.vortex2@gmail.com>2012-01-13 10:35:01 +0800
committerTakashi Iwai <tiwai@suse.de>2012-01-16 12:16:42 +0100
commit49b9c40e9b5e47ef64f8601b84981fa45c3c4f86 (patch)
tree963fc2585b16cdf8bd83e9fc9403354afa4b4385 /sound
parent7b32486ca449a20d64fa381262cc5e56893f0ac1 (diff)
downloadlinux-stable-49b9c40e9b5e47ef64f8601b84981fa45c3c4f86.tar.gz
linux-stable-49b9c40e9b5e47ef64f8601b84981fa45c3c4f86.tar.bz2
linux-stable-49b9c40e9b5e47ef64f8601b84981fa45c3c4f86.zip
ALSA: Au88x0 - Reduce the number of playback subdevices of au8830 from 32 to 16
- The maximum number of playback streams depend on the number of sample rate conveters (16) and the number of DMA channels (32). Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/au88x0/au88x0.c3
-rw-r--r--sound/pci/au88x0/au88x0.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index b8bc11556ed0..f13ad536b2d5 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -274,7 +274,8 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
return err;
}
// ADB pcm.
- if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_ADB, NR_ADB)) < 0) {
+ err = snd_vortex_new_pcm(chip, VORTEX_PCM_ADB, NR_PCM);
+ if (err < 0) {
snd_card_free(card);
return err;
}
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h
index 02f6e08f7592..bb938153a964 100644
--- a/sound/pci/au88x0/au88x0.h
+++ b/sound/pci/au88x0/au88x0.h
@@ -105,6 +105,7 @@
#define MIX_SPDIF(x) (vortex->mixspdif[x])
#define NR_WTPB 0x20 /* WT channels per each bank. */
+#define NR_PCM 0x10
/* Structs */
typedef struct {