diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-24 10:40:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-24 10:40:06 +0200 |
| commit | 931b23ade6dc0d2f8090bf1e7430bc63f62163fb (patch) | |
| tree | 0dcb3b61c7c365c545e6a9dcbd999f634db211d1 /sound | |
| parent | 1720d065ed79ead777d00b0673406ec458423b82 (diff) | |
| parent | 391e69143d0a05f960e3ab39a8c26b7b230bb8a9 (diff) | |
Merge branch 'topic/misc' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/control.c | 4 | ||||
| -rw-r--r-- | sound/pci/ctxfi/ctpcm.c | 2 | ||||
| -rw-r--r-- | sound/pci/ctxfi/ctsrc.c | 2 | ||||
| -rw-r--r-- | sound/pci/ctxfi/ctvmem.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index f8c5be464510..dc2a44048c85 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1072,8 +1072,8 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, long private_size; struct user_element *ue; int idx, err; - - if (card->user_ctl_count >= MAX_USER_CONTROLS) + + if (!replace && card->user_ctl_count >= MAX_USER_CONTROLS) return -ENOMEM; if (info->count < 1) return -EINVAL; diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c index 457d21189b0d..2c8622617c8c 100644 --- a/sound/pci/ctxfi/ctpcm.c +++ b/sound/pci/ctxfi/ctpcm.c @@ -404,7 +404,7 @@ int ct_alsa_pcm_create(struct ct_atc *atc, int err; int playback_count, capture_count; - playback_count = (IEC958 == device) ? 1 : 8; + playback_count = (IEC958 == device) ? 1 : 256; capture_count = (FRONT == device) ? 1 : 0; err = snd_pcm_new(atc->card, "ctxfi", device, playback_count, capture_count, &pcm); diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c index c749fa720889..e134b3a5780d 100644 --- a/sound/pci/ctxfi/ctsrc.c +++ b/sound/pci/ctxfi/ctsrc.c @@ -20,7 +20,7 @@ #include "cthardware.h" #include <linux/slab.h> -#define SRC_RESOURCE_NUM 64 +#define SRC_RESOURCE_NUM 256 #define SRCIMP_RESOURCE_NUM 256 static unsigned int conj_mask; diff --git a/sound/pci/ctxfi/ctvmem.h b/sound/pci/ctxfi/ctvmem.h index b23adfca4de6..e6da60eb19ce 100644 --- a/sound/pci/ctxfi/ctvmem.h +++ b/sound/pci/ctxfi/ctvmem.h @@ -18,7 +18,7 @@ #ifndef CTVMEM_H #define CTVMEM_H -#define CT_PTP_NUM 1 /* num of device page table pages */ +#define CT_PTP_NUM 4 /* num of device page table pages */ #include <linux/mutex.h> #include <linux/list.h> |