diff options
-rw-r--r-- | sound/core/seq/seq_clientmgr.c | 6 | ||||
-rw-r--r-- | sound/drivers/virmidi.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index c8bd37ee8375..95bd5ae92b92 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c | |||
@@ -157,7 +157,7 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid) | |||
157 | } | 157 | } |
158 | } | 158 | } |
159 | } else if (clientid >= 64 && clientid < 128) { | 159 | } else if (clientid >= 64 && clientid < 128) { |
160 | int card = (clientid - 64) / 8; | 160 | int card = (clientid - 64) / 4; |
161 | if (card < snd_ecards_limit) { | 161 | if (card < snd_ecards_limit) { |
162 | if (! card_requested[card]) { | 162 | if (! card_requested[card]) { |
163 | card_requested[card] = 1; | 163 | card_requested[card] = 1; |
@@ -2208,12 +2208,12 @@ int snd_seq_create_kernel_client(struct snd_card *card, int client_index, | |||
2208 | 2208 | ||
2209 | if (callback == NULL) | 2209 | if (callback == NULL) |
2210 | return -EINVAL; | 2210 | return -EINVAL; |
2211 | if (card && client_index > 7) | 2211 | if (card && client_index > 3) |
2212 | return -EINVAL; | 2212 | return -EINVAL; |
2213 | if (card == NULL && client_index > 63) | 2213 | if (card == NULL && client_index > 63) |
2214 | return -EINVAL; | 2214 | return -EINVAL; |
2215 | if (card) | 2215 | if (card) |
2216 | client_index += 64 + (card->number << 3); | 2216 | client_index += 64 + (card->number << 2); |
2217 | 2217 | ||
2218 | if (down_interruptible(®ister_mutex)) | 2218 | if (down_interruptible(®ister_mutex)) |
2219 | return -ERESTARTSYS; | 2219 | return -ERESTARTSYS; |
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c index a7b9241fff3c..9f36a6472478 100644 --- a/sound/drivers/virmidi.c +++ b/sound/drivers/virmidi.c | |||
@@ -61,7 +61,7 @@ MODULE_DESCRIPTION("Dummy soundcard for virtual rawmidi devices"); | |||
61 | MODULE_LICENSE("GPL"); | 61 | MODULE_LICENSE("GPL"); |
62 | MODULE_SUPPORTED_DEVICE("{{ALSA,Virtual rawmidi device}}"); | 62 | MODULE_SUPPORTED_DEVICE("{{ALSA,Virtual rawmidi device}}"); |
63 | 63 | ||
64 | #define MAX_MIDI_DEVICES 8 | 64 | #define MAX_MIDI_DEVICES 4 |
65 | 65 | ||
66 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ | 66 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ |
67 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ | 67 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ |
@@ -75,7 +75,7 @@ MODULE_PARM_DESC(id, "ID string for virmidi soundcard."); | |||
75 | module_param_array(enable, bool, NULL, 0444); | 75 | module_param_array(enable, bool, NULL, 0444); |
76 | MODULE_PARM_DESC(enable, "Enable this soundcard."); | 76 | MODULE_PARM_DESC(enable, "Enable this soundcard."); |
77 | module_param_array(midi_devs, int, NULL, 0444); | 77 | module_param_array(midi_devs, int, NULL, 0444); |
78 | MODULE_PARM_DESC(midi_devs, "MIDI devices # (1-8)"); | 78 | MODULE_PARM_DESC(midi_devs, "MIDI devices # (1-4)"); |
79 | 79 | ||
80 | struct snd_card_virmidi { | 80 | struct snd_card_virmidi { |
81 | struct snd_card *card; | 81 | struct snd_card *card; |