From feaa3a900f69b3323120c5bcbea586d8e026c13c Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Sun, 20 Nov 2005 14:08:28 +0100
Subject: [PATCH] --- yaml --- r: 16117 b: refs/heads/master c:
 204bdb1b50013c7aa3922d8b66df943123087bd8 h: refs/heads/master i:   16115:
 8f593ea9572d7d6ee01ffd61e85baaaf0bf1a43e v: v3

---
 [refs]                               | 2 +-
 trunk/sound/core/seq/seq_clientmgr.c | 6 +++---
 trunk/sound/drivers/virmidi.c        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 328c4cb78437..7aa190ec2cf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 332682b1cd540dd7abbbbfc1905af8139e76e1b7
+refs/heads/master: 204bdb1b50013c7aa3922d8b66df943123087bd8
diff --git a/trunk/sound/core/seq/seq_clientmgr.c b/trunk/sound/core/seq/seq_clientmgr.c
index c8bd37ee8375..95bd5ae92b92 100644
--- a/trunk/sound/core/seq/seq_clientmgr.c
+++ b/trunk/sound/core/seq/seq_clientmgr.c
@@ -157,7 +157,7 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid)
 				}
 			}
 		} else if (clientid >= 64 && clientid < 128) {
-			int card = (clientid - 64) / 8;
+			int card = (clientid - 64) / 4;
 			if (card < snd_ecards_limit) {
 				if (! card_requested[card]) {
 					card_requested[card] = 1;
@@ -2208,12 +2208,12 @@ int snd_seq_create_kernel_client(struct snd_card *card, int client_index,
 
 	if (callback == NULL)
 		return -EINVAL;
-	if (card && client_index > 7)
+	if (card && client_index > 3)
 		return -EINVAL;
 	if (card == NULL && client_index > 63)
 		return -EINVAL;
 	if (card)
-		client_index += 64 + (card->number << 3);
+		client_index += 64 + (card->number << 2);
 
 	if (down_interruptible(&register_mutex))
 		return -ERESTARTSYS;
diff --git a/trunk/sound/drivers/virmidi.c b/trunk/sound/drivers/virmidi.c
index a7b9241fff3c..9f36a6472478 100644
--- a/trunk/sound/drivers/virmidi.c
+++ b/trunk/sound/drivers/virmidi.c
@@ -61,7 +61,7 @@ MODULE_DESCRIPTION("Dummy soundcard for virtual rawmidi devices");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{ALSA,Virtual rawmidi device}}");
 
-#define MAX_MIDI_DEVICES	8
+#define MAX_MIDI_DEVICES	4
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
 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.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable this soundcard.");
 module_param_array(midi_devs, int, NULL, 0444);
-MODULE_PARM_DESC(midi_devs, "MIDI devices # (1-8)");
+MODULE_PARM_DESC(midi_devs, "MIDI devices # (1-4)");
 
 struct snd_card_virmidi {
 	struct snd_card *card;