[PATCH] [UBUNTU:sound/{drivers/opl3, synth/emux}/] Fix port type bits

[crimsun at fungus.sh.nu]

Subject: [PATCH] [UBUNTU:sound/{drivers/opl3,synth/emux}/] Fix port type bits

UpstreamStatus: Added in upstream alsa-kernel hg changeset 16248e283298
                http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=16248e28329887902b20e937f3c7dd3250a3d285;style=raw

Fix the port information about non-MIDI messages that had wrong values
for some OPL3 and EmuX ports.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

---

 sound/drivers/opl3/opl3_oss.c |    3 +--
 sound/drivers/opl3/opl3_seq.c |    2 +-
 sound/synth/emux/emux_seq.c   |    3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

bbff9a246b53414e6775073caf6930487dede71c
diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c
index 4802a7d..16085d9 100644
--- a/sound/drivers/opl3/opl3_oss.c
+++ b/sound/drivers/opl3/opl3_oss.c
@@ -99,8 +99,7 @@ static int snd_opl3_oss_create_port(opl3
 	opl3->oss_chset->port = snd_seq_event_port_attach(opl3->seq_client, &callbacks,
 							  SNDRV_SEQ_PORT_CAP_WRITE,
 							  SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
-							  SNDRV_SEQ_PORT_TYPE_MIDI_GM |
-							  SNDRV_SEQ_PORT_TYPE_SYNTH,
+							  SNDRV_SEQ_PORT_TYPE_MIDI_GM,
 							  voices, voices,
 							  name);
 	if (opl3->oss_chset->port < 0) {
diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
index 673a53f..e9993ce 100644
--- a/sound/drivers/opl3/opl3_seq.c
+++ b/sound/drivers/opl3/opl3_seq.c
@@ -203,7 +203,7 @@ static int snd_opl3_synth_create_port(op
 						      SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
 						      SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
 						      SNDRV_SEQ_PORT_TYPE_MIDI_GM |
-						      SNDRV_SEQ_PORT_TYPE_SYNTH,
+						      SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE,
 						      16, voices,
 						      name);
 	if (opl3->chset->port < 0) {
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index 8ccd33f..821b24d 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -55,8 +55,7 @@ static snd_midi_op_t emux_ops = {
 #define DEFAULT_MIDI_TYPE	(SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |\
 				 SNDRV_SEQ_PORT_TYPE_MIDI_GM |\
 				 SNDRV_SEQ_PORT_TYPE_MIDI_GS |\
-				 SNDRV_SEQ_PORT_TYPE_MIDI_XG |\
-				 SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE)
+				 SNDRV_SEQ_PORT_TYPE_MIDI_XG)
 
 /*
  * Initialise the EMUX Synth by creating a client and registering
-- 
1.1.3


-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060602/c6114a1f/attachment.sig>